" . PHP_EOL;
} else {
- $html .= "
" . PHP_EOL;
+ $html .= "
" . PHP_EOL;
}
$this->generateTableTag($worksheet, $id, $html, $sheetIndex);
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php b/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
index 540882708..fe5cfe25c 100644
--- a/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
+++ b/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
@@ -67,14 +67,28 @@ class Tcpdf extends Pdf
// Set the appropriate font
$pdf->SetFont($this->getFont());
+ $this->checkRtlAndLtr();
+ if ($this->rtlSheets && !$this->ltrSheets) {
+ $pdf->setRTL(true);
+ }
$pdf->writeHTML($this->generateHTMLAll());
// Document info
- $pdf->SetTitle($this->spreadsheet->getProperties()->getTitle());
- $pdf->SetAuthor($this->spreadsheet->getProperties()->getCreator());
- $pdf->SetSubject($this->spreadsheet->getProperties()->getSubject());
- $pdf->SetKeywords($this->spreadsheet->getProperties()->getKeywords());
- $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
+ $pdf->SetTitle(
+ $this->spreadsheet->getProperties()->getTitle()
+ );
+ $pdf->SetAuthor(
+ $this->spreadsheet->getProperties()->getCreator()
+ );
+ $pdf->SetSubject(
+ $this->spreadsheet->getProperties()->getSubject()
+ );
+ $pdf->SetKeywords(
+ $this->spreadsheet->getProperties()->getKeywords()
+ );
+ $pdf->SetCreator(
+ $this->spreadsheet->getProperties()->getCreator()
+ );
// Write to file
fwrite($fileHandle, $pdf->output('', 'S'));
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 6437e2c19..9bb4f68f0 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -10,7 +10,6 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Cell\DataType;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
use PhpOffice\PhpSpreadsheet\RichText\RichText;
-use PhpOffice\PhpSpreadsheet\Settings;
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
use PhpOffice\PhpSpreadsheet\Style\Conditional;
@@ -1440,10 +1439,7 @@ class Worksheet extends WriterPart
$objWriter->writeElement(
't',
StringHelper::controlCharacterPHP2OOXML(
- htmlspecialchars(
- $cellValue,
- Settings::htmlEntityFlags()
- )
+ $cellValue
)
);
$objWriter->endElement();
diff --git a/tests/PhpSpreadsheetTests/Calculation/CustomFunction.php b/tests/PhpSpreadsheetTests/Calculation/CustomFunction.php
index 1ce5cf5d2..7e0fea0a7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/CustomFunction.php
+++ b/tests/PhpSpreadsheetTests/Calculation/CustomFunction.php
@@ -6,6 +6,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation;
use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
class CustomFunction
{
@@ -19,4 +20,25 @@ class CustomFunction
return $number ** 4;
}
+
+ /**
+ * ASC.
+ * Converts full-width (double-byte) characters to half-width (single-byte) characters.
+ * There are many difficulties with implementing this into PhpSpreadsheet.
+ */
+ public static function ASC(mixed $stringValue): string
+ {
+ /*if (is_array($stringValue)) {
+ return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
+ }*/
+ $stringValue = StringHelper::convertToString($stringValue, convertBool: true);
+ if (function_exists('mb_convert_kana')) {
+ return mb_convert_kana($stringValue, 'a', 'UTF-8');
+ }
+ // Fallback if mb_convert_kana is not available.
+ // PhpSpreadsheet heavily relies on mbstring, so this is more of a theoretical fallback.
+ // A comprehensive manual conversion is extensive.
+
+ return $stringValue;
+ }
}
diff --git a/tests/PhpSpreadsheetTests/Calculation/CustomFunctionTest.php b/tests/PhpSpreadsheetTests/Calculation/CustomFunctionTest.php
index 1c536fad4..03262dfc0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/CustomFunctionTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/CustomFunctionTest.php
@@ -31,4 +31,19 @@ class CustomFunctionTest extends TestCase
self::assertSame('#NAME?', $calculation->calculateFormula('=FOURTHPOWER(3)'));
self::assertFalse(Calculation::removeFunction('WHATEVER'));
}
+
+ public static function testReplaceDummyFunction(): void
+ {
+ $functions = Calculation::getFunctions();
+ $key = 'ASC';
+ $oldValue = $functions[$key] ?? null;
+ self::assertIsArray($oldValue);
+ $calculation = Calculation::getInstance();
+ $value = $oldValue;
+ $value['functionCall'] = [CustomFunction::class, 'ASC'];
+ self::assertTrue(Calculation::addFunction($key, $value));
+ self::assertSame('ABC', $calculation->calculateFormula('=ASC("ＡＢＣ")'));
+ self::assertTrue(Calculation::removeFunction('ASC'));
+ self::assertTrue(Calculation::addFunction($key, $oldValue));
+ }
}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Issue4451Test.php b/tests/PhpSpreadsheetTests/Calculation/Issue4451Test.php
new file mode 100644
index 000000000..3b9107d18
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Issue4451Test.php
@@ -0,0 +1,128 @@
+setAccessible(true);
+
+ // Call the method using reflection
+ $reflectionMethod->invokeArgs($calculation, [&$matrix1, &$matrix2, count($matrix1), 1, count($matrix2), 1]);
+
+ self::assertSame([[1], [3], [null]], $matrix1); //* @phpstan-ignore-line
+ }
+
+ /**
+ * These 2 tests are contrived. They prove that method
+ * works as desired, but Excel will actually return
+ * a CALC error, a result I don't know how to duplicate.
+ */
+ public static function testExtendFirstColumn(): void
+ {
+ $spreadsheet = new Spreadsheet();
+ $sheet = $spreadsheet->getActiveSheet();
+ $sheet->setTitle('Products');
+ $calculationEngine = Calculation::getInstance($spreadsheet);
+ $calculationEngine->setInstanceArrayReturnType(
+ Calculation::RETURN_ARRAY_AS_ARRAY
+ );
+
+ $sheet->getCell('D5')->setValue(5);
+ $sheet->getCell('E5')->setValue(20);
+ $sheet->fromArray(
+ [
+ [5, 20, 'Apples'],
+ [10, 20, 'Bananas'],
+ [5, 20, 'Cherries'],
+ [5, 40, 'Grapes'],
+ [25, 50, 'Peaches'],
+ [30, 60, 'Pears'],
+ [35, 70, 'Papayas'],
+ [40, 80, 'Mangos'],
+ [null, 20, 'Unknown'],
+ ],
+ null,
+ 'K1',
+ true
+ );
+ $kRows = $sheet->getHighestDataRow('K');
+ self::assertSame(8, $kRows);
+ $lRows = $sheet->getHighestDataRow('L');
+ self::assertSame(9, $lRows);
+ $mRows = $sheet->getHighestDataRow('M');
+ self::assertSame(9, $mRows);
+ $sheet->getCell('A1')
+ ->setValue(
+ "=FILTER(Products!M1:M$mRows,"
+ . "(Products!K1:K$kRows=D5)"
+ . "*(Products!L1:L$lRows=E5))"
+ );
+
+ $result = $sheet->getCell('A1')->getCalculatedValue();
+ self::assertSame([['Apples'], ['Cherries']], $result);
+ $spreadsheet->disconnectWorksheets();
+ }
+
+ public static function testExtendSecondColumn(): void
+ {
+ $spreadsheet = new Spreadsheet();
+ $sheet = $spreadsheet->getActiveSheet();
+ $sheet->setTitle('Products');
+ $calculationEngine = Calculation::getInstance($spreadsheet);
+ $calculationEngine->setInstanceArrayReturnType(
+ Calculation::RETURN_ARRAY_AS_ARRAY
+ );
+
+ $sheet->getCell('D5')->setValue(5);
+ $sheet->getCell('E5')->setValue(20);
+ $sheet->fromArray(
+ [
+ [5, 20, 'Apples'],
+ [10, 20, 'Bananas'],
+ [5, 20, 'Cherries'],
+ [5, 40, 'Grapes'],
+ [25, 50, 'Peaches'],
+ [30, 60, 'Pears'],
+ [35, 70, 'Papayas'],
+ [40, 80, 'Mangos'],
+ [null, 20, 'Unknown'],
+ ],
+ null,
+ 'K1',
+ true
+ );
+ $kRows = $sheet->getHighestDataRow('K');
+ self::assertSame(8, $kRows);
+ //$lRows = $sheet->getHighestDataRow('L');
+ //self::assertSame(9, $lRows);
+ $lRows = 2;
+ $mRows = $sheet->getHighestDataRow('M');
+ self::assertSame(9, $mRows);
+ $sheet->getCell('A1')
+ ->setValue(
+ "=FILTER(Products!M1:M$mRows,"
+ . "(Products!K1:K$kRows=D5)"
+ . "*(Products!L1:L$lRows=E5))"
+ );
+
+ $result = $sheet->getCell('A1')->getCalculatedValue();
+ self::assertSame([['Apples']], $result);
+ $spreadsheet->disconnectWorksheets();
+ }
+}
diff --git a/tests/PhpSpreadsheetTests/Issue4521Test.php b/tests/PhpSpreadsheetTests/Issue4521Test.php
new file mode 100644
index 000000000..9c7ff3949
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Issue4521Test.php
@@ -0,0 +1,56 @@
+outfile !== '') {
+ unlink($this->outfile);
+ $this->outfile = '';
+ }
+ }
+
+ public function testEmptyFile(): void
+ {
+ $this->outfile = File::temporaryFilename();
+ file_put_contents($this->outfile, '');
+ $spreadsheet = IOFactory::load($this->outfile);
+ $sheet = $spreadsheet->getActiveSheet();
+ self::assertSame('A', $sheet->getHighestColumn());
+ self::assertSame(1, $sheet->getHighestRow());
+ $spreadsheet->disconnectWorksheets();
+ }
+
+ public function testCrlfFile(): void
+ {
+ if (PHP_MAJOR_VERSION === $this->weirdMimetypeMajor) {
+ if (
+ PHP_MINOR_VERSION === $this->weirdMimetypeMinor1
+ || PHP_MINOR_VERSION === $this->weirdMimetypeMinor2
+ ) {
+ self::markTestSkipped('Php mimetype bug with this release');
+ }
+ }
+ $this->outfile = File::temporaryFilename();
+ file_put_contents($this->outfile, "\r\n");
+ $spreadsheet = IOFactory::load($this->outfile);
+ $sheet = $spreadsheet->getActiveSheet();
+ self::assertSame('A', $sheet->getHighestColumn());
+ self::assertSame(1, $sheet->getHighestRow());
+ $spreadsheet->disconnectWorksheets();
+ }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/DirectionTest.php b/tests/PhpSpreadsheetTests/Reader/Html/DirectionTest.php
new file mode 100644
index 000000000..5021a54f3
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Html/DirectionTest.php
@@ -0,0 +1,92 @@
+",
+ '
',
+ '',
+ '| a1 | ',
+ 'b1 | ',
+ 'c1 | ',
+ '
',
+ '',
+ '| a2 | ',
+ 'b2 | ',
+ 'c2 | ',
+ '
',
+ '