diff --git a/composer.lock b/composer.lock
index 675d99363..0f8048c3e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1564,21 +1564,22 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.45.0",
+ "version": "v3.48.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "c0daa33cb2533cd73f48dde1c70c2afa3e7953b5"
+ "reference": "a92472c6fb66349de25211f31c77eceae3df024e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c0daa33cb2533cd73f48dde1c70c2afa3e7953b5",
- "reference": "c0daa33cb2533cd73f48dde1c70c2afa3e7953b5",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a92472c6fb66349de25211f31c77eceae3df024e",
+ "reference": "a92472c6fb66349de25211f31c77eceae3df024e",
"shasum": ""
},
"require": {
"composer/semver": "^3.4",
"composer/xdebug-handler": "^3.0.3",
+ "ext-filter": "*",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^7.4 || ^8.0",
@@ -1642,7 +1643,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.45.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.48.0"
},
"funding": [
{
@@ -1650,7 +1651,7 @@
"type": "github"
}
],
- "time": "2023-12-30T02:07:07+00:00"
+ "time": "2024-01-19T21:44:39+00:00"
},
{
"name": "masterminds/html5",
@@ -5426,5 +5427,5 @@
"platform-overrides": {
"php": "8.0.99"
},
- "plugin-api-version": "2.6.0"
+ "plugin-api-version": "2.3.0"
}
diff --git a/samples/Basic/01_Simple_download_pdf.php b/samples/Basic/01_Simple_download_pdf.php
index ddd99d29c..424bc2cab 100644
--- a/samples/Basic/01_Simple_download_pdf.php
+++ b/samples/Basic/01_Simple_download_pdf.php
@@ -44,7 +44,7 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
// Set active sheet index to the first sheet, so Excel opens this as the first sheet
$spreadsheet->setActiveSheetIndex(0);
-IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
+IOFactory::registerWriter('Pdf', PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
// Redirect output to a client’s web browser (PDF)
header('Content-Type: application/pdf');
diff --git a/samples/Basic/28_Iterator.php b/samples/Basic/28_Iterator.php
index 104dc47f3..9af40f475 100644
--- a/samples/Basic/28_Iterator.php
+++ b/samples/Basic/28_Iterator.php
@@ -7,13 +7,13 @@ require __DIR__ . '/../Header.php';
$sampleSpreadsheet = require __DIR__ . '/../templates/sampleSpreadsheet.php';
$filename = $helper->getTemporaryFilename();
-$writer = new XlsxWriter($sampleSpreadsheet);
+$writer = new XLsxWriter($sampleSpreadsheet);
$callStartTime = microtime(true);
$writer->save($filename);
$helper->logWrite($writer, $filename, $callStartTime);
$callStartTime = microtime(true);
-$reader = new XlsxReader();
+$reader = new XLsxReader();
$spreadsheet = $reader->load($filename);
$helper->logRead('Xlsx', $filename, $callStartTime);
unlink($filename);
diff --git a/samples/Bootstrap.php b/samples/Bootstrap.php
index f15de26a6..1d3fb2f6e 100644
--- a/samples/Bootstrap.php
+++ b/samples/Bootstrap.php
@@ -19,4 +19,4 @@ foreach ($paths as $path) {
}
}
-throw new \Exception('Composer autoloader could not be found. Install dependencies with `composer install` and try again.');
+throw new Exception('Composer autoloader could not be found. Install dependencies with `composer install` and try again.');
diff --git a/samples/Chart/32_Chart_read_write_HTML.php b/samples/Chart/32_Chart_read_write_HTML.php
index 0dc5484ce..4984f19bb 100644
--- a/samples/Chart/32_Chart_read_write_HTML.php
+++ b/samples/Chart/32_Chart_read_write_HTML.php
@@ -7,7 +7,7 @@ require __DIR__ . '/../Header.php';
// Change these values to select the Rendering library that you wish to use
//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+Settings::setChartRenderer(PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
$inputFileType = 'Xlsx';
$inputFileNames = __DIR__ . '/../templates/36write*.xlsx';
diff --git a/samples/Chart/32_Chart_read_write_PDF.php b/samples/Chart/32_Chart_read_write_PDF.php
index 0ac41f71f..55b8ef252 100644
--- a/samples/Chart/32_Chart_read_write_PDF.php
+++ b/samples/Chart/32_Chart_read_write_PDF.php
@@ -5,11 +5,11 @@ use PhpOffice\PhpSpreadsheet\Settings;
require __DIR__ . '/../Header.php';
-IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
+IOFactory::registerWriter('Pdf', PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
// Change these values to select the Rendering library that you wish to use
//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+Settings::setChartRenderer(PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
$inputFileType = 'Xlsx';
$inputFileNames = __DIR__ . '/../templates/36write*.xlsx';
diff --git a/samples/Chart/35_Chart_render.php b/samples/Chart/35_Chart_render.php
index 57eb691ef..e9d76d618 100644
--- a/samples/Chart/35_Chart_render.php
+++ b/samples/Chart/35_Chart_render.php
@@ -7,7 +7,7 @@ require __DIR__ . '/../Header.php';
// Change these values to select the Rendering library that you wish to use
//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+Settings::setChartRenderer(PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
$inputFileType = 'Xlsx';
$inputFileNames = __DIR__ . '/../templates/32readwrite*[0-9].xlsx';
diff --git a/samples/Chart/35_Chart_render33.php b/samples/Chart/35_Chart_render33.php
index f9c7c11ad..1b4e85332 100644
--- a/samples/Chart/35_Chart_render33.php
+++ b/samples/Chart/35_Chart_render33.php
@@ -7,7 +7,7 @@ require __DIR__ . '/../Header.php';
// Change these values to select the Rendering library that you wish to use
//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+Settings::setChartRenderer(PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
$inputFileType = 'Xlsx';
$inputFileNamesString = $helper->getTemporaryFolder() . '/33_Chart_create_*.xlsx';
diff --git a/samples/Chart/37_Chart_dynamic_title.php b/samples/Chart/37_Chart_dynamic_title.php
index e0df17cd0..8c37d006d 100644
--- a/samples/Chart/37_Chart_dynamic_title.php
+++ b/samples/Chart/37_Chart_dynamic_title.php
@@ -74,7 +74,7 @@ foreach ($inputFileNames as $inputFileName) {
$callStartTime = microtime(true);
$helper->write($spreadsheet, $inputFileName, ['Xlsx'], true);
- Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+ Settings::setChartRenderer(PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
$callStartTime = microtime(true);
$helper->write($spreadsheet, $inputFileName, ['Html'], true);
diff --git a/samples/DefinedNames/ScopedNamedRange.php b/samples/DefinedNames/ScopedNamedRange.php
index dc6a211fa..9066e7381 100644
--- a/samples/DefinedNames/ScopedNamedRange.php
+++ b/samples/DefinedNames/ScopedNamedRange.php
@@ -20,7 +20,7 @@ $worksheet
$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
// Create a second worksheet as our client timesheet
-$worksheet = $spreadsheet->addSheet(new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, 'Client Timesheet'));
+$worksheet = $spreadsheet->addSheet(new PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, 'Client Timesheet'));
// Define named ranges
// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
diff --git a/samples/DefinedNames/ScopedNamedRange2.php b/samples/DefinedNames/ScopedNamedRange2.php
index 9db8d44ea..94845a461 100644
--- a/samples/DefinedNames/ScopedNamedRange2.php
+++ b/samples/DefinedNames/ScopedNamedRange2.php
@@ -33,7 +33,7 @@ $clients = [
];
foreach ($clients as $clientName => $workHours) {
- $worksheet = $spreadsheet->addSheet(new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, $clientName));
+ $worksheet = $spreadsheet->addSheet(new PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, $clientName));
// Set up some basic data for a timesheet
$worksheet
diff --git a/samples/Pdf/21_Pdf_Domdf.php b/samples/Pdf/21_Pdf_Domdf.php
index aea4c96dc..53cae06ed 100644
--- a/samples/Pdf/21_Pdf_Domdf.php
+++ b/samples/Pdf/21_Pdf_Domdf.php
@@ -12,7 +12,7 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
$helper->log('Set orientation to landscape');
$spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
-$className = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class;
+$className = PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class;
$helper->log("Write to PDF format using {$className}");
IOFactory::registerWriter('Pdf', $className);
diff --git a/samples/Pdf/21_Pdf_TCPDF.php b/samples/Pdf/21_Pdf_TCPDF.php
index 9a8593e1c..8fed65b96 100644
--- a/samples/Pdf/21_Pdf_TCPDF.php
+++ b/samples/Pdf/21_Pdf_TCPDF.php
@@ -12,7 +12,7 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
$helper->log('Set orientation to landscape');
$spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
-$className = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf::class;
+$className = PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf::class;
$helper->log("Write to PDF format using {$className}");
IOFactory::registerWriter('Pdf', $className);
diff --git a/samples/Pdf/21_Pdf_mPDF.php b/samples/Pdf/21_Pdf_mPDF.php
index b99c22509..05e57016c 100644
--- a/samples/Pdf/21_Pdf_mPDF.php
+++ b/samples/Pdf/21_Pdf_mPDF.php
@@ -12,7 +12,7 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
$helper->log('Set orientation to landscape');
$spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
-$className = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class;
+$className = PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class;
$helper->log("Write to PDF format using {$className}");
IOFactory::registerWriter('Pdf', $className);
diff --git a/samples/Pdf/21d_FitToHeightPdf.php b/samples/Pdf/21d_FitToHeightPdf.php
index 577eac0c4..5eaf62a36 100644
--- a/samples/Pdf/21d_FitToHeightPdf.php
+++ b/samples/Pdf/21d_FitToHeightPdf.php
@@ -14,6 +14,6 @@ $spreadsheet = $reader->load($fileWithPath);
$sheet = $spreadsheet->getActiveSheet();
$helper->log('Write to Mpdf');
-IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
+IOFactory::registerWriter('Pdf', PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
$helper->write($spreadsheet, __FILE__, ['Pdf']);
$spreadsheet->disconnectWorksheets();
diff --git a/samples/Reader/20_Reader_worksheet_hyperlink_image.php b/samples/Reader/20_Reader_worksheet_hyperlink_image.php
index 19200ee21..0cd09ab8d 100644
--- a/samples/Reader/20_Reader_worksheet_hyperlink_image.php
+++ b/samples/Reader/20_Reader_worksheet_hyperlink_image.php
@@ -24,19 +24,19 @@ imagestring($gdImage, 1, 5, 5, 'Created with PhpSpreadsheet', $textColor);
$baseUrl = 'https://phpspreadsheet.readthedocs.io';
-$drawing = new \PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing();
+$drawing = new PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing();
$drawing->setName('In-Memory image 1');
$drawing->setDescription('In-Memory image 1');
$drawing->setCoordinates('A1');
$drawing->setImageResource($gdImage);
$drawing->setRenderingFunction(
- \PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing::RENDERING_JPEG
+ PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing::RENDERING_JPEG
);
-$drawing->setMimeType(\PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing::MIMETYPE_DEFAULT);
+$drawing->setMimeType(PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing::MIMETYPE_DEFAULT);
$drawing->setHeight(36);
$helper->log('Write image');
-$hyperLink = new \PhpOffice\PhpSpreadsheet\Cell\Hyperlink($baseUrl, 'test image');
+$hyperLink = new PhpOffice\PhpSpreadsheet\Cell\Hyperlink($baseUrl, 'test image');
$drawing->setHyperlink($hyperLink);
$helper->log('Write link: ' . $baseUrl);
@@ -44,10 +44,10 @@ $drawing->setWorksheet($aSheet);
$filename = File::temporaryFilename();
-$writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, $inputFileType);
+$writer = PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, $inputFileType);
$writer->save($filename);
-$reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
+$reader = PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
$reloadedSpreadsheet = $reader->load($filename);
unlink($filename);
diff --git a/samples/Reading_workbook_data/Properties.php b/samples/Reading_workbook_data/Properties.php
index 8f7be375c..a24a4967a 100644
--- a/samples/Reading_workbook_data/Properties.php
+++ b/samples/Reading_workbook_data/Properties.php
@@ -61,4 +61,4 @@ $helper->log('Company: ' . $company);
// Read the workbook manager property
$manager = $spreadsheet->getProperties()->getManager();
$helper->log('Manager: ' . $manager);
-$s = new \PhpOffice\PhpSpreadsheet\Helper\Sample();
+$s = new PhpOffice\PhpSpreadsheet\Helper\Sample();
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index e5e37e7a4..27c60dc97 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -998,7 +998,7 @@ class Calculation
],
'ERROR.TYPE' => [
'category' => Category::CATEGORY_INFORMATION,
- 'functionCall' => [Information\ExcelError::class, 'type'],
+ 'functionCall' => [ExcelError::class, 'type'],
'argumentCount' => '1',
],
'EVEN' => [
@@ -1826,7 +1826,7 @@ class Calculation
],
'NA' => [
'category' => Category::CATEGORY_INFORMATION,
- 'functionCall' => [Information\ExcelError::class, 'NA'],
+ 'functionCall' => [ExcelError::class, 'NA'],
'argumentCount' => '0',
],
'NEGBINOMDIST' => [
@@ -3394,7 +3394,7 @@ class Calculation
return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
} elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
// Convert numeric errors to NaN error
- return Information\ExcelError::NAN();
+ return ExcelError::NAN();
}
return $value;
@@ -3411,7 +3411,7 @@ class Calculation
}
// Convert numeric errors to NAN error
} elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
- return Information\ExcelError::NAN();
+ return ExcelError::NAN();
}
return $value;
@@ -3497,7 +3497,7 @@ class Calculation
self::$returnArrayAsType = $returnArrayAsType;
$testResult = Functions::flattenArray($result);
if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
- return Information\ExcelError::VALUE();
+ return ExcelError::VALUE();
}
// If there's only a single cell in the array, then we allow it
if (count($testResult) != 1) {
@@ -3505,13 +3505,13 @@ class Calculation
$r = array_keys($result);
$r = array_shift($r);
if (!is_numeric($r)) {
- return Information\ExcelError::VALUE();
+ return ExcelError::VALUE();
}
if (is_array($result[$r])) {
$c = array_keys($result[$r]);
$c = array_shift($c);
if (!is_numeric($c)) {
- return Information\ExcelError::VALUE();
+ return ExcelError::VALUE();
}
}
}
@@ -3522,7 +3522,7 @@ class Calculation
if ($result === null && $cell->getWorksheet()->getSheetView()->getShowZeros()) {
return 0;
} elseif ((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
- return Information\ExcelError::NAN();
+ return ExcelError::NAN();
}
return $result;
@@ -4267,7 +4267,7 @@ class Calculation
$val = $rangeStartMatches[2] . '!' . $val;
}
} else {
- $val = Information\ExcelError::REF();
+ $val = ExcelError::REF();
}
} else {
$rangeStartCellRef = $output[count($output) - 1]['value'] ?? '';
@@ -4336,7 +4336,7 @@ class Calculation
}
$val = $address;
}
- } elseif ($val === Information\ExcelError::REF()) {
+ } elseif ($val === ExcelError::REF()) {
$stackItemReference = $val;
} else {
/** @var non-empty-string $startRowColRef */
@@ -4639,8 +4639,8 @@ class Calculation
}
} catch (Exception $e) {
if ($e->getCode() === Exception::CALCULATION_ENGINE_PUSH_TO_STACK) {
- $stack->push('Error', Information\ExcelError::REF(), null);
- $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as error value %s', $token->value(), Information\ExcelError::REF());
+ $stack->push('Error', ExcelError::REF(), null);
+ $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as error value %s', $token->value(), ExcelError::REF());
} else {
return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
}
@@ -4735,7 +4735,7 @@ class Calculation
$oCol[] = Coordinate::columnIndexFromString($oCR[0]) - 1;
$oRow[] = $oCR[1];
} catch (\Exception) {
- $stack->push('Error', Information\ExcelError::REF(), null);
+ $stack->push('Error', ExcelError::REF(), null);
$breakNeeded = true;
break;
@@ -4755,7 +4755,7 @@ class Calculation
$stack->push('Cell Reference', $cellValue, $cellRef);
} else {
$this->debugLog->writeDebugLog('Evaluation Result is a #REF! Error');
- $stack->push('Error', Information\ExcelError::REF(), null);
+ $stack->push('Error', ExcelError::REF(), null);
}
break;
@@ -4826,7 +4826,7 @@ class Calculation
}
if (count(Functions::flattenArray($cellIntersect)) === 0) {
$this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellIntersect));
- $stack->push('Error', Information\ExcelError::null(), null);
+ $stack->push('Error', ExcelError::null(), null);
} else {
$cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':'
. Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
@@ -4877,7 +4877,7 @@ class Calculation
if (isset($matches[8])) {
if ($cell === null) {
// We can't access the range, so return a REF error
- $cellValue = Information\ExcelError::REF();
+ $cellValue = ExcelError::REF();
} else {
$cellRef = $matches[6] . $matches[7] . ':' . $matches[9] . $matches[10];
if ($matches[2] > '') {
@@ -4907,7 +4907,7 @@ class Calculation
} else {
if ($cell === null) {
// We can't access the cell, so return a REF error
- $cellValue = Information\ExcelError::REF();
+ $cellValue = ExcelError::REF();
} else {
$cellRef = $matches[6] . $matches[7];
if ($matches[2] > '') {
@@ -4924,7 +4924,7 @@ class Calculation
$cell->attach($pCellParent);
} else {
$cellRef = ($cellSheet !== null) ? "'{$matches[2]}'!{$cellRef}" : $cellRef;
- $cellValue = ($cellSheet !== null) ? null : Information\ExcelError::REF();
+ $cellValue = ($cellSheet !== null) ? null : ExcelError::REF();
}
} else {
return $this->raiseFormulaError('Unable to access Cell Reference');
@@ -5225,7 +5225,7 @@ class Calculation
&& ((is_string($operand1) && !is_numeric($operand1) && $operand1 !== '')
|| (is_string($operand2) && !is_numeric($operand2) && $operand2 !== ''))
) {
- $result = Information\ExcelError::VALUE();
+ $result = ExcelError::VALUE();
} elseif (is_array($operand1) || is_array($operand2)) {
// Ensure that both operands are arrays/matrices
if (is_array($operand1)) {
@@ -5271,7 +5271,7 @@ class Calculation
break;
case '/':
if ($operand2[$row][$column] == 0) {
- $operand1[$row][$column] = Information\ExcelError::DIV0();
+ $operand1[$row][$column] = ExcelError::DIV0();
} else {
$operand1[$row][$column] /= $operand2[$row][$column];
}
@@ -5310,8 +5310,8 @@ class Calculation
case '/':
if ($operand2 == 0) {
// Trap for Divide by Zero error
- $stack->push('Error', Information\ExcelError::DIV0());
- $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails(Information\ExcelError::DIV0()));
+ $stack->push('Error', ExcelError::DIV0());
+ $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails(ExcelError::DIV0()));
return false;
}
@@ -5429,7 +5429,7 @@ class Calculation
// Named range?
$namedRange = ($worksheet === null) ? null : DefinedName::resolveName($range, $worksheet);
if ($namedRange === null) {
- return Information\ExcelError::REF();
+ return ExcelError::REF();
}
$worksheet = $namedRange->getWorksheet();
@@ -5581,7 +5581,7 @@ class Calculation
$definedNameScope = $namedRange->getScope();
if ($definedNameScope !== null && $definedNameScope !== $cellWorksheet) {
// The defined name isn't in our current scope, so #REF
- $result = Information\ExcelError::REF();
+ $result = ExcelError::REF();
$stack->push('Error', $result, $namedRange->getName());
return $result;
@@ -5656,6 +5656,6 @@ class Calculation
private static function makeError(mixed $operand = ''): string
{
- return Information\ErrorValue::isError($operand) ? $operand : Information\ExcelError::VALUE();
+ return Information\ErrorValue::isError($operand) ? $operand : ExcelError::VALUE();
}
}
diff --git a/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php b/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
index 88a4affac..7e55c9768 100644
--- a/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
+++ b/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
@@ -71,7 +71,7 @@ class TimeValue
} elseif ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
$retValue = (int) SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
} else {
- $retValue = new DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
+ $retValue = new Datetime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
}
}
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php b/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
index 5be841784..b18762078 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
@@ -4,7 +4,6 @@ namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
class Lookup
{
@@ -34,7 +33,7 @@ class Lookup
$lookupColumns = self::columnCount($lookupVector);
// we correctly orient our results
if (($lookupRows === 1 && $lookupColumns > 1) || (!$hasResultVector && $lookupRows === 2 && $lookupColumns !== 2)) {
- $lookupVector = LookupRef\Matrix::transpose($lookupVector);
+ $lookupVector = Matrix::transpose($lookupVector);
$lookupRows = self::rowCount($lookupVector);
$lookupColumns = self::columnCount($lookupVector);
}
@@ -85,7 +84,7 @@ class Lookup
// we correctly orient our results
if ($resultRows === 1 && $resultColumns > 1) {
- $resultVector = LookupRef\Matrix::transpose($resultVector);
+ $resultVector = Matrix::transpose($resultVector);
}
return $resultVector;
diff --git a/src/PhpSpreadsheet/Reader/Csv.php b/src/PhpSpreadsheet/Reader/Csv.php
index 35a474200..9d9c26ede 100644
--- a/src/PhpSpreadsheet/Reader/Csv.php
+++ b/src/PhpSpreadsheet/Reader/Csv.php
@@ -273,7 +273,7 @@ class Csv extends BaseReader
// Open file
$fhandle = $this->canRead($filename);
if (!$fhandle) {
- throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+ throw new ReaderException($filename . ' is an Invalid Spreadsheet file.');
}
if ($this->inputEncoding === self::GUESS_ENCODING) {
$this->inputEncoding = self::guessEncoding($filename, $this->fallbackEncoding);
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 36c707244..6d20e1563 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -2185,7 +2185,7 @@ class Xls extends BaseReader
}
// bit: 31-26; mask: 0xFC000000 fill pattern
- if ($fillType = Xls\Style\FillPattern::lookup((self::FC000000 & self::getInt4d($recordData, 14)) >> 26)) {
+ if ($fillType = FillPattern::lookup((self::FC000000 & self::getInt4d($recordData, 14)) >> 26)) {
$objStyle->getFill()->setFillType($fillType);
}
// offset: 18; size: 2; pattern and background colour
@@ -2231,7 +2231,7 @@ class Xls extends BaseReader
$objStyle->getFill()->endcolorIndex = (0x00003F80 & $borderAndBackground) >> 7;
// bit: 21-16; mask: 0x003F0000; fill pattern
- $objStyle->getFill()->setFillType(Xls\Style\FillPattern::lookup((0x003F0000 & $borderAndBackground) >> 16));
+ $objStyle->getFill()->setFillType(FillPattern::lookup((0x003F0000 & $borderAndBackground) >> 16));
// bit: 24-22; mask: 0x01C00000; bottom line style
$objStyle->getBorders()->getBottom()->setBorderStyle(Xls\Style\Border::lookup((0x01C00000 & $borderAndBackground) >> 22));
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 9ccedbdea..a5c8837e9 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -101,7 +101,7 @@ class Xlsx extends BaseReader
}
// Phpstan thinks, correctly, that xpath can return false.
- private static function xpathNoFalse(SimpleXmlElement $sxml, string $path): array
+ private static function xpathNoFalse(SimpleXMLElement $sxml, string $path): array
{
return self::falseToArray($sxml->xpath($path));
}
@@ -852,7 +852,7 @@ class Xlsx extends BaseReader
$value = self::castToBoolean($c);
} else {
$value = null;
- $cellDataType = DATATYPE::TYPE_NULL;
+ $cellDataType = DataType::TYPE_NULL;
}
} else {
// Formula
@@ -2054,7 +2054,7 @@ class Xlsx extends BaseReader
}
}
- private static function getLockValue(SimpleXmlElement $protection, string $key): ?bool
+ private static function getLockValue(SimpleXMLElement $protection, string $key): ?bool
{
$returnValue = null;
$protectKey = $protection[$key];
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
index 8f9d42a1b..5a3ae8a94 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -282,7 +282,7 @@ class ConditionalStyles
return $dataBar;
}
- private function readColorScale(simpleXMLElement|stdClass $cfRule): ConditionalColorScale
+ private function readColorScale(SimpleXMLElement|stdClass $cfRule): ConditionalColorScale
{
$colorScale = new ConditionalColorScale();
$types = [];
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Styles.php b/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
index 098ac6e07..4646cde23 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
@@ -54,7 +54,7 @@ class Styles extends BaseParserClass
return Xlsx::testSimpleXml($attr);
}
- public function setStyleXml(SimpleXmlElement $styleXml): void
+ public function setStyleXml(SimpleXMLElement $styleXml): void
{
$this->styleXml = $styleXml;
}
diff --git a/src/PhpSpreadsheet/Shared/Escher/DgContainer.php b/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
index dd80109ca..0f4b7a864 100644
--- a/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
+++ b/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
@@ -39,12 +39,12 @@ class DgContainer
$this->lastSpId = $value;
}
- public function getSpgrContainer(): ?DgContainer\SpgrContainer
+ public function getSpgrContainer(): ?SpgrContainer
{
return $this->spgrContainer;
}
- public function getSpgrContainerOrThrow(): DgContainer\SpgrContainer
+ public function getSpgrContainerOrThrow(): SpgrContainer
{
if ($this->spgrContainer !== null) {
return $this->spgrContainer;
@@ -53,7 +53,7 @@ class DgContainer
throw new SpreadsheetException('spgrContainer is unexpectedly null');
}
- public function setSpgrContainer(DgContainer\SpgrContainer $spgrContainer): DgContainer\SpgrContainer
+ public function setSpgrContainer(SpgrContainer $spgrContainer): SpgrContainer
{
return $this->spgrContainer = $spgrContainer;
}
diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php
index 68eedb7be..dbf6df80e 100644
--- a/src/PhpSpreadsheet/Shared/OLE.php
+++ b/src/PhpSpreadsheet/Shared/OLE.php
@@ -301,7 +301,7 @@ class OLE
$type = self::readInt1($fh);
switch ($type) {
case self::OLE_PPS_TYPE_ROOT:
- $pps = new OLE\PPS\Root(null, null, []);
+ $pps = new Root(null, null, []);
$this->root = $pps;
break;
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index e695a4d0c..7dca5b45f 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -410,10 +410,10 @@ class Spreadsheet implements JsonSerializable
$this->activeSheetIndex = 0;
// Create document properties
- $this->properties = new Document\Properties();
+ $this->properties = new Properties();
// Create document security
- $this->security = new Document\Security();
+ $this->security = new Security();
// Set defined names
$this->definedNames = [];
@@ -463,7 +463,7 @@ class Spreadsheet implements JsonSerializable
/**
* Get properties.
*/
- public function getProperties(): Document\Properties
+ public function getProperties(): Properties
{
return $this->properties;
}
@@ -471,7 +471,7 @@ class Spreadsheet implements JsonSerializable
/**
* Set properties.
*/
- public function setProperties(Document\Properties $documentProperties): void
+ public function setProperties(Properties $documentProperties): void
{
$this->properties = $documentProperties;
}
@@ -479,7 +479,7 @@ class Spreadsheet implements JsonSerializable
/**
* Get security.
*/
- public function getSecurity(): Document\Security
+ public function getSecurity(): Security
{
return $this->security;
}
@@ -487,7 +487,7 @@ class Spreadsheet implements JsonSerializable
/**
* Set security.
*/
- public function setSecurity(Document\Security $documentSecurity): void
+ public function setSecurity(Security $documentSecurity): void
{
$this->security = $documentSecurity;
}
diff --git a/src/PhpSpreadsheet/Style/Conditional.php b/src/PhpSpreadsheet/Style/Conditional.php
index a78dfa00c..c62e2f278 100644
--- a/src/PhpSpreadsheet/Style/Conditional.php
+++ b/src/PhpSpreadsheet/Style/Conditional.php
@@ -224,7 +224,7 @@ class Conditional implements IComparable
/**
* Set Conditions.
*
- * @param (bool|float|int|string)[]|bool|float|int|string $conditions Condition
+ * @param bool|(bool|float|int|string)[]|float|int|string $conditions Condition
*
* @return $this
*/
diff --git a/src/PhpSpreadsheet/Worksheet/BaseDrawing.php b/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
index 0c093d853..4c3543825 100644
--- a/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
+++ b/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
@@ -386,14 +386,14 @@ class BaseDrawing implements IComparable
return $this;
}
- public function getShadow(): Drawing\Shadow
+ public function getShadow(): Shadow
{
return $this->shadow;
}
- public function setShadow(?Drawing\Shadow $shadow = null): self
+ public function setShadow(?Shadow $shadow = null): self
{
- $this->shadow = $shadow ?? new Drawing\Shadow();
+ $this->shadow = $shadow ?? new Shadow();
return $this;
}
diff --git a/src/PhpSpreadsheet/Worksheet/Table.php b/src/PhpSpreadsheet/Worksheet/Table.php
index de851ebfd..e2ebf478f 100644
--- a/src/PhpSpreadsheet/Worksheet/Table.php
+++ b/src/PhpSpreadsheet/Worksheet/Table.php
@@ -506,7 +506,7 @@ class Table implements Stringable
/**
* Get table Style.
*/
- public function getStyle(): Table\TableStyle
+ public function getStyle(): TableStyle
{
return $this->style;
}
diff --git a/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php b/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
index acb8e3bdd..6d757e918 100644
--- a/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
+++ b/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
@@ -47,7 +47,7 @@ class AutoFilters
}
}
- protected function formatRange(Worksheet $worksheet, Autofilter $autofilter): string
+ protected function formatRange(Worksheet $worksheet, AutoFilter $autofilter): string
{
$title = $worksheet->getTitle();
$range = $autofilter->getRange();
diff --git a/src/PhpSpreadsheet/Writer/Xls.php b/src/PhpSpreadsheet/Writer/Xls.php
index 4a2b5ed9f..9e57afd46 100644
--- a/src/PhpSpreadsheet/Writer/Xls.php
+++ b/src/PhpSpreadsheet/Writer/Xls.php
@@ -90,7 +90,7 @@ class Xls extends BaseWriter
{
$this->spreadsheet = $spreadsheet;
- $this->parser = new Xls\Parser($spreadsheet);
+ $this->parser = new Parser($spreadsheet);
}
/**
@@ -114,12 +114,12 @@ class Xls extends BaseWriter
$this->colors = [];
// Initialise workbook writer
- $this->writerWorkbook = new Xls\Workbook($this->spreadsheet, $this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser);
+ $this->writerWorkbook = new Workbook($this->spreadsheet, $this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser);
// Initialise worksheet writers
$countSheets = $this->spreadsheet->getSheetCount();
for ($i = 0; $i < $countSheets; ++$i) {
- $this->writerWorksheets[$i] = new Xls\Worksheet($this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser, $this->preCalculateFormulas, $this->spreadsheet->getSheet($i));
+ $this->writerWorksheets[$i] = new Worksheet($this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser, $this->preCalculateFormulas, $this->spreadsheet->getSheet($i));
}
// build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 39d3ed35b..49d1ef67f 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -313,7 +313,7 @@ class Worksheet extends WriterPart
$paneTopLeftCell = $worksheet->getPaneTopLeftCell();
$paneState = $worksheet->getPaneState();
$normalFreeze = '';
- if ($paneState === PhpSpreadsheetWorksheet::PANE_FROZEN) {
+ if ($paneState === PhpspreadsheetWorksheet::PANE_FROZEN) {
if ($ySplit > 0) {
$normalFreeze = ($xSplit <= 0) ? 'bottomLeft' : 'bottomRight';
} else {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index 74f46d4bf..fbac0ff91 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -13,7 +13,7 @@ class RangeTest extends TestCase
{
private string $incompleteMessage = 'Must be revisited';
- private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadSheet;
+ private Spreadsheet $spreadSheet;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php
index 86b5d8163..213331eb5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php
@@ -17,7 +17,7 @@ class ImConjugateTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php
index e50487f54..ef7332f32 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php
@@ -17,7 +17,7 @@ class ImCosTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php
index e1e4f144e..a972e7d1f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php
@@ -17,7 +17,7 @@ class ImCoshTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php
index 59832f470..97f88b604 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php
@@ -17,7 +17,7 @@ class ImCotTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php
index ff6d76f9e..d694bc9d7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php
@@ -17,7 +17,7 @@ class ImCscTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php
index 8bada9ce4..cf1a88817 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php
@@ -17,7 +17,7 @@ class ImCschTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php
index 9e6f1444b..9c73efa81 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php
@@ -17,7 +17,7 @@ class ImDivTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php
index 4ecfa1a88..23541b2cc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php
@@ -17,7 +17,7 @@ class ImExpTest extends TestCase
{
const COMPLEX_PRECISION = (PHP_INT_SIZE > 4) ? 1E-12 : 1E-9;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php
index f7a762453..655ae31c5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php
@@ -17,7 +17,7 @@ class ImLnTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php
index 848e7f86d..c7940c600 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php
@@ -17,7 +17,7 @@ class ImLog10Test extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php
index ba9bd7652..42ab29cf6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php
@@ -17,7 +17,7 @@ class ImLog2Test extends TestCase
{
const COMPLEX_PRECISION = 1E-8;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php
index 62d462b4d..4a33ba6a3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php
@@ -17,7 +17,7 @@ class ImPowerTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php
index 15112f909..256498b71 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php
@@ -17,7 +17,7 @@ class ImProductTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php
index 6e2436dfa..583b08494 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php
@@ -17,7 +17,7 @@ class ImSecTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php
index d1a4d999d..c1840a427 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php
@@ -17,7 +17,7 @@ class ImSechTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php
index 83aab29e2..347d522e1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php
@@ -17,7 +17,7 @@ class ImSinTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php
index ecef552c5..4198033fa 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php
@@ -17,7 +17,7 @@ class ImSinhTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php
index cffb1bba4..7edf1e032 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php
@@ -17,7 +17,7 @@ class ImSqrtTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php
index adc35c75d..ff95604ed 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php
@@ -17,7 +17,7 @@ class ImSubTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php
index b1690c8a3..625348de6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php
@@ -17,7 +17,7 @@ class ImSumTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php
index cf553c7c5..949e42a64 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php
@@ -17,7 +17,7 @@ class ImTanTest extends TestCase
{
const COMPLEX_PRECISION = 1E-12;
- private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert;
+ private ComplexAssert $complexAssert;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/DefinedNameTest.php b/tests/PhpSpreadsheetTests/DefinedNameTest.php
index 75b559be0..34fac61d9 100644
--- a/tests/PhpSpreadsheetTests/DefinedNameTest.php
+++ b/tests/PhpSpreadsheetTests/DefinedNameTest.php
@@ -12,7 +12,7 @@ use PHPUnit\Framework\TestCase;
class DefinedNameTest extends TestCase
{
- private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet;
+ private Spreadsheet $spreadsheet;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/IOFactoryTest.php b/tests/PhpSpreadsheetTests/IOFactoryTest.php
index e483b0b45..b8283ba2d 100644
--- a/tests/PhpSpreadsheetTests/IOFactoryTest.php
+++ b/tests/PhpSpreadsheetTests/IOFactoryTest.php
@@ -164,7 +164,7 @@ class IOFactoryTest extends TestCase
public function testRegisterInvalidWriter(): void
{
- $this->expectException(\PhpOffice\PhpSpreadsheet\Writer\Exception::class);
+ $this->expectException(Writer\Exception::class);
// @phpstan-ignore-next-line
IOFactory::registerWriter('foo', 'bar');
@@ -179,7 +179,7 @@ class IOFactoryTest extends TestCase
public function testCreateInvalidWriter(): void
{
- $this->expectException(\PhpOffice\PhpSpreadsheet\Writer\Exception::class);
+ $this->expectException(Writer\Exception::class);
$spreadsheet = new Spreadsheet();
IOFactory::createWriter($spreadsheet, 'bad');
}
diff --git a/tests/PhpSpreadsheetTests/NamedFormulaTest.php b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
index 103a1250b..0d9b45cde 100644
--- a/tests/PhpSpreadsheetTests/NamedFormulaTest.php
+++ b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
@@ -11,7 +11,7 @@ use PHPUnit\Framework\TestCase;
class NamedFormulaTest extends TestCase
{
- private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet;
+ private Spreadsheet $spreadsheet;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/NamedRangeTest.php b/tests/PhpSpreadsheetTests/NamedRangeTest.php
index 0d69ccb80..8a49bf3ac 100644
--- a/tests/PhpSpreadsheetTests/NamedRangeTest.php
+++ b/tests/PhpSpreadsheetTests/NamedRangeTest.php
@@ -11,7 +11,7 @@ use PHPUnit\Framework\TestCase;
class NamedRangeTest extends TestCase
{
- private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet;
+ private Spreadsheet $spreadsheet;
protected function setUp(): void
{
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php
index b567173d4..9f85c9567 100644
--- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php
@@ -106,7 +106,7 @@ class HtmlLoadStringTest extends TestCase