diff --git a/CHANGELOG.md b/CHANGELOG.md index 00f19a8cd4..b5e5b419b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com) and this project adheres to [Semantic Versioning](https://semver.org). -## TBD - 3.8.0 +## TBD - 3.9.0 ### Added -- CHOOSECOLS, CHOOSEROWS, DROP, TAKE, and EXPAND. [PR #4286](https://github.com/PHPOffice/PhpSpreadsheet/pull/4286) +- Methods to get style for row or column. [PR #4317](https://github.com/PHPOffice/PhpSpreadsheet/pull/4317) +- Method for duplicating worksheet in spreadsheet. [PR #4315](https://github.com/PHPOffice/PhpSpreadsheet/pull/4315) ### Changed @@ -25,7 +26,23 @@ and this project adheres to [Semantic Versioning](https://semver.org). ### Fixed +- Ods Reader Sheet Names with Period. [Issue #4311](https://github.com/PHPOffice/PhpSpreadsheet/issues/4311) [PR #4313](https://github.com/PHPOffice/PhpSpreadsheet/pull/4313) +- Mpdf and Tcpdf Hidden Columns and Merged Cells. [Issue #4319](https://github.com/PHPOffice/PhpSpreadsheet/issues/4319) [PR #4320](https://github.com/PHPOffice/PhpSpreadsheet/pull/4320) +- Html Writer Allow mailto. [Issue #4316](https://github.com/PHPOffice/PhpSpreadsheet/issues/4316) [PR #4322](https://github.com/PHPOffice/PhpSpreadsheet/pull/4322) +- Use composer/pcre rather than preg_* in Writer. [PR #4323](https://github.com/PHPOffice/PhpSpreadsheet/pull/4323) + +## 2025-01-11 - 3.8.0 + +### Added + +- CHOOSECOLS, CHOOSEROWS, DROP, TAKE, and EXPAND. [PR #4286](https://github.com/PHPOffice/PhpSpreadsheet/pull/4286) + +### Fixed + +- Security patch for Html navigation. - Xlsx Reader Shared Formula with Boolean Result. Partial solution for [Issue #4280](https://github.com/PHPOffice/PhpSpreadsheet/issues/4280) [PR #4281](https://github.com/PHPOffice/PhpSpreadsheet/pull/4281) +- Retitling cloned Worksheets. [Issue #641](https://github.com/PHPOffice/PhpSpreadsheet/issues/641) [PR #4302](https://github.com/PHPOffice/PhpSpreadsheet/pull/4302) +- Extremely limited support for GROUPBY function. Partial response to [Issue #4282](https://github.com/PHPOffice/PhpSpreadsheet/issues/4282) [PR #4283](https://github.com/PHPOffice/PhpSpreadsheet/pull/4283) ## 2024-12-26 - 3.7.0 diff --git a/LICENSE b/LICENSE index 3ec5723dde..04a90f083e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 PhpSpreadsheet Authors +Copyright (c) 2019-2025 PhpSpreadsheet Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index 7f1777676c..22d22c1a67 100644 --- a/composer.json +++ b/composer.json @@ -79,6 +79,7 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", + "composer/pcre": "^3.3", "maennchen/zipstream-php": "^2.1 || ^3.0", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", diff --git a/composer.lock b/composer.lock index 3025170cb3..ee9da8ac4f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,87 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f7caa2101e268445a358275ee83b90d9", + "content-hash": "264ef911bd6d773a3a9085bc86b0ea48", "packages": [ + { + "name": "composer/pcre", + "version": "3.3.2", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, + "require-dev": { + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-strict-rules": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9" + }, + "type": "library", + "extra": { + "phpstan": { + "includes": [ + "extension.neon" + ] + }, + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.3.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-11-12T16:29:46+00:00" + }, { "name": "maennchen/zipstream-php", "version": "3.1.1", @@ -467,85 +546,6 @@ ], "time": "2022-12-23T10:58:28+00:00" }, - { - "name": "composer/pcre", - "version": "3.2.0", - "source": { - "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0" - }, - "conflict": { - "phpstan/phpstan": "<1.11.8" - }, - "require-dev": { - "phpstan/phpstan": "^1.11.8", - "phpstan/phpstan-strict-rules": "^1.1", - "phpunit/phpunit": "^8 || ^9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - }, - "phpstan": { - "includes": [ - "extension.neon" - ] - } - }, - "autoload": { - "psr-4": { - "Composer\\Pcre\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "PCRE wrapping library that offers type-safe preg_* replacements.", - "keywords": [ - "PCRE", - "preg", - "regex", - "regular expression" - ], - "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.2.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2024-07-25T09:36:02+00:00" - }, { "name": "composer/semver", "version": "3.4.2", @@ -1221,16 +1221,16 @@ }, { "name": "mitoteam/jpgraph", - "version": "10.4.3", + "version": "10.4.4", "source": { "type": "git", "url": "https://github.com/mitoteam/jpgraph.git", - "reference": "f0db97108aec23a3bbb34721365931af992b83b3" + "reference": "9ad8e2fcc30f765c788a28543e9705fb541d499f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/f0db97108aec23a3bbb34721365931af992b83b3", - "reference": "f0db97108aec23a3bbb34721365931af992b83b3", + "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/9ad8e2fcc30f765c788a28543e9705fb541d499f", + "reference": "9ad8e2fcc30f765c788a28543e9705fb541d499f", "shasum": "" }, "require": { @@ -1270,9 +1270,9 @@ ], "support": { "issues": "https://github.com/mitoteam/jpgraph/issues", - "source": "https://github.com/mitoteam/jpgraph/tree/10.4.3" + "source": "https://github.com/mitoteam/jpgraph/tree/10.4.4" }, - "time": "2024-12-01T06:36:31+00:00" + "time": "2025-01-01T05:39:20+00:00" }, { "name": "mpdf/mpdf", diff --git a/docs/references/function-list-by-category.md b/docs/references/function-list-by-category.md index 447c97367e..e6a702028f 100644 --- a/docs/references/function-list-by-category.md +++ b/docs/references/function-list-by-category.md @@ -249,6 +249,7 @@ EXPAND | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Choos FILTER | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Filter::filter FORMULATEXT | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Formula::text GETPIVOTDATA | **Not yet Implemented** +GROUPBY | **Not yet Implemented** HLOOKUP | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\HLookup::lookup HYPERLINK | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Hyperlink::set INDEX | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Matrix::index diff --git a/docs/references/function-list-by-name.md b/docs/references/function-list-by-name.md index 868da519a2..3696b95b7c 100644 --- a/docs/references/function-list-by-name.md +++ b/docs/references/function-list-by-name.md @@ -239,6 +239,7 @@ GCD | CATEGORY_MATH_AND_TRIG | \PhpOffice\PhpSpread GEOMEAN | CATEGORY_STATISTICAL | \PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages\Mean::geometric GESTEP | CATEGORY_ENGINEERING | \PhpOffice\PhpSpreadsheet\Calculation\Engineering\Compare::GESTEP GETPIVOTDATA | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented** +GROUPBY | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented** GROWTH | CATEGORY_STATISTICAL | \PhpOffice\PhpSpreadsheet\Calculation\Statistical\Trends::GROWTH ## H diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md index 8b27155d90..076ac79b58 100644 --- a/docs/topics/recipes.md +++ b/docs/topics/recipes.md @@ -925,6 +925,9 @@ getStyle('A1:M500'), rather than styling the cells individually in a loop. This is much faster compared to looping through cells and styling them individually. +**Tip** If you are styling entire row(s) or column(s), e.g. getStyle('A:A'), it is recommended to use applyFromArray as described below rather than setting the styles individually as described above. +Also, starting with release 3.9.0, you should use getRowStyle or getColumnStyle to get the style for an entire row or column. + There is also an alternative manner to set styles. The following code sets a cell's style to font bold, alignment right, top border thin and a gradient fill: diff --git a/docs/topics/worksheets.md b/docs/topics/worksheets.md index 0199f13c6a..5b15089b61 100644 --- a/docs/topics/worksheets.md +++ b/docs/topics/worksheets.md @@ -95,19 +95,38 @@ insert the clone into the workbook. ```php $clonedWorksheet = clone $spreadsheet->getSheetByName('Worksheet 1'); -$clonedWorksheet->setTitle('Copy of Worksheet 1'); +$clonedWorksheet->setTitle('Copy of Worksheet 1'); // must be unique $spreadsheet->addSheet($clonedWorksheet); ``` +Starting with PhpSpreadsheet 3.9.0, this can be done more simply (copied sheet's title will be set to something unique): +```php +$copiedWorksheet = $spreadsheet->duplicateWorksheetByTitle('sheetname'); +``` You can also copy worksheets from one workbook to another, though this is more complex as PhpSpreadsheet also has to replicate the styling between the two workbooks. The `addExternalSheet()` method is provided for this purpose. - $clonedWorksheet = clone $spreadsheet1->getSheetByName('Worksheet 1'); - $spreadsheet->addExternalSheet($clonedWorksheet); +```php +$clonedWorksheet = clone $spreadsheet1->getSheetByName('Worksheet 1'); +$clonedWorksheet->setTitle('Copy of Worksheet 1'); // must be unique +$spreadsheet1->addSheet($clonedWorksheet); +$spreadsheet->addExternalSheet($clonedWorksheet); +``` +Starting with PhpSpreadsheet 3.8.0, this can be simplified: +```php +$clonedWorksheet = clone $spreadsheet1->getSheetByName('Worksheet 1'); +$spreadsheet1->addSheet($clonedWorksheet, null, true); +$spreadsheet->addExternalSheet($clonedWorksheet); +``` +Starting with PhpSpreadsheet 3.9.0, this can be simplified even further: +```php +$clonedWorksheet = $spreadsheet1->duplicateWorksheetByTitle('sheetname'); +$spreadsheet->addExternalSheet($clonedWorksheet); +``` -In both cases, it is the developer's responsibility to ensure that +In the cases commented "must be unique", it is the developer's responsibility to ensure that worksheet names are not duplicated. PhpSpreadsheet will throw an exception if you attempt to copy worksheets that will result in a duplicate name. diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 06fbbcdd66..e34d429456 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -2,6 +2,7 @@ includes: - phpstan-baseline.neon - vendor/phpstan/phpstan-phpunit/extension.neon - vendor/phpstan/phpstan-phpunit/rules.neon + - vendor/composer/pcre/extension.neon parameters: level: 8 diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php index 38ba4d9c45..e9d3402590 100644 --- a/samples/Pdf/21b_Pdf.php +++ b/samples/Pdf/21b_Pdf.php @@ -1,5 +1,6 @@ EOF; - return preg_replace($bodystring, $bodyrepl, $html) ?? ''; + return preg_replace($bodystring, $bodyrepl, $html) ?? throw new SpreadsheetException('preg failed'); } require __DIR__ . '/../Header.php'; diff --git a/samples/Pdf/21c_Pdf.php b/samples/Pdf/21c_Pdf.php index 5a6a26d379..66d964aedd 100644 --- a/samples/Pdf/21c_Pdf.php +++ b/samples/Pdf/21c_Pdf.php @@ -1,5 +1,6 @@ /'; $simulatedBodyStart = Mpdf::SIMULATED_BODY_START; $bodyrepl = <<S F Y g:i A', (int) $propertyValue) : '*****INVALID*****'; + $propertyValue = is_numeric($propertyValue) ? date('l, j<\s\u\p>S F Y g:i A', (int) $propertyValue) : '*****INVALID*****'; $propertyType = 'date'; break; diff --git a/samples/Reading_workbook_data/Properties.php b/samples/Reading_workbook_data/Properties.php index a24a4967a8..441b12c9a5 100644 --- a/samples/Reading_workbook_data/Properties.php +++ b/samples/Reading_workbook_data/Properties.php @@ -19,7 +19,7 @@ // Read the Date when the workbook was created (as a PHP timestamp value) $creationDatestamp = $spreadsheet->getProperties()->getCreated(); -$creationDate = Date::formattedDateTimeFromTimestamp("$creationDatestamp", 'l, d<\s\up>S F Y'); +$creationDate = Date::formattedDateTimeFromTimestamp("$creationDatestamp", 'l, j<\s\u\p>S F Y'); $creationTime = Date::formattedDateTimeFromTimestamp("$creationDatestamp", 'g:i A'); $helper->log('Created On: ' . $creationDate . ' at ' . $creationTime); @@ -30,7 +30,7 @@ // Read the Date when the workbook was last modified (as a PHP timestamp value) $modifiedDatestamp = $spreadsheet->getProperties()->getModified(); // Format the date and time using the standard PHP date() function -$modifiedDate = Date::formattedDateTimeFromTimestamp("$modifiedDatestamp", 'l, d<\s\up>S F Y'); +$modifiedDate = Date::formattedDateTimeFromTimestamp("$modifiedDatestamp", 'l, j<\s\u\p>S F Y'); $modifiedTime = Date::formattedDateTimeFromTimestamp("$modifiedDatestamp", 'g:i A'); $helper->log('Last Modified On: ' . $modifiedDate . ' at ' . $modifiedTime); diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php index c31ea2c749..b256aad3b3 100644 --- a/src/PhpSpreadsheet/Calculation/Calculation.php +++ b/src/PhpSpreadsheet/Calculation/Calculation.php @@ -1256,6 +1256,11 @@ public static function getExcelConstants(string $key): bool|null 'functionCall' => [Functions::class, 'DUMMY'], 'argumentCount' => '2+', ], + 'GROUPBY' => [ + 'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE, + 'functionCall' => [Functions::class, 'DUMMY'], + 'argumentCount' => '3-7', + ], 'GROWTH' => [ 'category' => Category::CATEGORY_STATISTICAL, 'functionCall' => [Statistical\Trends::class, 'GROWTH'], @@ -4601,7 +4606,7 @@ private static function dataTestReference(array &$operandData): mixed private static int $matchIndex10 = 10; /** - * @return array|false + * @return array|false|string */ private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell $cell = null) { @@ -5182,6 +5187,9 @@ private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token, $matches)) { // if the token is a named range or formula, evaluate it and push the result onto the stack $definedName = $matches[6]; + if (str_starts_with($definedName, '_xleta')) { + return Functions::NOT_YET_IMPLEMENTED; + } if ($cell === null || $pCellWorksheet === null) { return $this->raiseFormulaError("undefined name '$token'"); } @@ -5214,6 +5222,7 @@ private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell } $result = $this->evaluateDefinedName($cell, $namedRange, $pCellWorksheet, $stack, $specifiedWorksheet !== ''); + if (isset($storeKey)) { $branchStore[$storeKey] = $result; } diff --git a/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php b/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php index 27862d7a5a..6e54e0039e 100644 --- a/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php +++ b/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php @@ -6,10 +6,24 @@ class FormulaTranslator { - public static function convertToExcelAddressValue(string $openOfficeAddress): string + private static function replaceQuotedPeriod(string $value): string { - $excelAddress = $openOfficeAddress; + $value2 = ''; + $quoted = false; + foreach (mb_str_split($value, 1, 'UTF-8') as $char) { + if ($char === "'") { + $quoted = !$quoted; + } elseif ($char === '.' && $quoted) { + $char = "\u{fffe}"; + } + $value2 .= $char; + } + return $value2; + } + + public static function convertToExcelAddressValue(string $openOfficeAddress): string + { // Cell range 3-d reference // As we don't support 3-d ranges, we're just going to take a quick and dirty approach // and assume that the second worksheet reference is the same as the first @@ -20,6 +34,7 @@ public static function convertToExcelAddressValue(string $openOfficeAddress): st '/\$?([^\.]+)\.([^\.]+)/miu', // Cell reference in another sheet '/\.([^\.]+):\.([^\.]+)/miu', // Cell range reference '/\.([^\.]+)/miu', // Simple cell reference + '/\\x{FFFE}/miu', // restore quoted periods ], [ '$1!$2:$4', @@ -27,8 +42,9 @@ public static function convertToExcelAddressValue(string $openOfficeAddress): st '$1!$2', '$1:$2', '$1', + '.', ], - $excelAddress + self::replaceQuotedPeriod($openOfficeAddress) ); return $excelAddress; @@ -52,14 +68,16 @@ public static function convertToExcelFormulaValue(string $openOfficeFormula): st '/\[\$?([^\.]+)\.([^\.]+)\]/miu', // Cell reference in another sheet '/\[\.([^\.]+):\.([^\.]+)\]/miu', // Cell range reference '/\[\.([^\.]+)\]/miu', // Simple cell reference + '/\\x{FFFE}/miu', // restore quoted periods ], [ '$1!$2:$3', '$1!$2', '$1:$2', '$1', + '.', ], - $value + self::replaceQuotedPeriod($value) ); // Convert references to defined names/formulae $value = str_replace('$$', '', $value); diff --git a/src/PhpSpreadsheet/Shared/StringHelper.php b/src/PhpSpreadsheet/Shared/StringHelper.php index a16b1cafc0..73bb057dfb 100644 --- a/src/PhpSpreadsheet/Shared/StringHelper.php +++ b/src/PhpSpreadsheet/Shared/StringHelper.php @@ -638,4 +638,9 @@ public static function testStringAsNumeric(string $textValue): float|string return (is_numeric(substr($textValue, 0, strlen((string) $v)))) ? $v : $textValue; } + + public static function strlenAllowNull(?string $string): int + { + return strlen("$string"); + } } diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index 943db95cc3..86f9d891ea 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -514,7 +514,7 @@ public function getActiveSheet(): Worksheet public function createSheet(?int $sheetIndex = null): Worksheet { $newSheet = new Worksheet($this); - $this->addSheet($newSheet, $sheetIndex); + $this->addSheet($newSheet, $sheetIndex, true); return $newSheet; } @@ -529,14 +529,35 @@ public function sheetNameExists(string $worksheetName): bool return $this->getSheetByName($worksheetName) !== null; } + public function duplicateWorksheetByTitle(string $title): Worksheet + { + $original = $this->getSheetByNameOrThrow($title); + $index = $this->getIndex($original) + 1; + $clone = clone $original; + + return $this->addSheet($clone, $index, true); + } + /** * Add sheet. * * @param Worksheet $worksheet The worksheet to add * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last) */ - public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null): Worksheet + public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null, bool $retitleIfNeeded = false): Worksheet { + if ($retitleIfNeeded) { + $title = $worksheet->getTitle(); + if ($this->sheetNameExists($title)) { + $i = 1; + $newTitle = "$title $i"; + while ($this->sheetNameExists($newTitle)) { + ++$i; + $newTitle = "$title $i"; + } + $worksheet->setTitle($newTitle); + } + } if ($this->sheetNameExists($worksheet->getTitle())) { throw new Exception( "Workbook already contains a worksheet named '{$worksheet->getTitle()}'. Rename this worksheet first." @@ -1080,6 +1101,11 @@ public function getCellXfByIndex(int $cellStyleIndex): Style return $this->cellXfCollection[$cellStyleIndex]; } + public function getCellXfByIndexOrNull(?int $cellStyleIndex): ?Style + { + return ($cellStyleIndex === null) ? null : ($this->cellXfCollection[$cellStyleIndex] ?? null); + } + /** * Get cellXf by hash code. * diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php index 2c4a469559..4b88fcadc9 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -50,7 +50,7 @@ public function setEvaluated(bool $value): void /** * Create a new AutoFilter. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range * A simple string containing a Cell range like 'A1:E10' is permitted * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or an AddressRange object. diff --git a/src/PhpSpreadsheet/Worksheet/Table.php b/src/PhpSpreadsheet/Worksheet/Table.php index 234014a0ff..a7a62a954c 100644 --- a/src/PhpSpreadsheet/Worksheet/Table.php +++ b/src/PhpSpreadsheet/Worksheet/Table.php @@ -64,7 +64,7 @@ class Table implements Stringable /** * Create a new Table. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range * A simple string containing a Cell range like 'A1:E10' is permitted * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or an AddressRange object. @@ -268,7 +268,7 @@ public function getRange(): string /** * Set Table Cell Range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range * A simple string containing a Cell range like 'A1:E10' is permitted * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or an AddressRange object. diff --git a/src/PhpSpreadsheet/Worksheet/Validations.php b/src/PhpSpreadsheet/Worksheet/Validations.php index 99b5eedbc5..ec78c22b0b 100644 --- a/src/PhpSpreadsheet/Worksheet/Validations.php +++ b/src/PhpSpreadsheet/Worksheet/Validations.php @@ -36,7 +36,7 @@ public static function validateCellAddress(null|CellAddress|string|array $cellAd /** * Validate a cell address or cell range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12'; + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12'; * or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]), * or as a CellAddress or AddressRange object. */ @@ -59,7 +59,7 @@ public static function validateCellOrCellRange(AddressRange|CellAddress|int|stri /** * Validate a cell range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12'; + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12'; * or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]), * or as an AddressRange object. */ diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php index 0e66f2b894..4bc7d26244 100644 --- a/src/PhpSpreadsheet/Worksheet/Worksheet.php +++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php @@ -49,6 +49,8 @@ class Worksheet public const MERGE_CELL_CONTENT_HIDE = 'hide'; public const MERGE_CELL_CONTENT_MERGE = 'merge'; + public const FUNCTION_LIKE_GROUPBY = '/\\b(groupby|_xleta)\\b/i'; // weird new syntax + protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui'; /** @@ -321,6 +323,7 @@ public function __construct(?Spreadsheet $parent = null, string $title = 'Worksh { // Set parent and title $this->parent = $parent; + $this->hash = spl_object_id($this); $this->setTitle($title, false); // setTitle can change $pTitle $this->setCodeName($this->getTitle()); @@ -349,7 +352,6 @@ public function __construct(?Spreadsheet $parent = null, string $title = 'Worksh $this->autoFilter = new AutoFilter('', $this); // Table collection $this->tableCollection = new ArrayObject(); - $this->hash = spl_object_id($this); } /** @@ -869,7 +871,7 @@ public function setTitle(string $title, bool $updateFormulaCellReferences = true // Syntax check self::checkSheetTitle($title); - if ($this->parent) { + if ($this->parent && $this->parent->getIndex($this, true) >= 0) { // Is there already such sheet name? if ($this->parent->sheetNameExists($title)) { // Use name, but append with lowest possible integer @@ -899,7 +901,7 @@ public function setTitle(string $title, bool $updateFormulaCellReferences = true // Set title $this->title = $title; - if ($this->parent && $this->parent->getCalculationEngine()) { + if ($this->parent && $this->parent->getIndex($this, true) >= 0 && $this->parent->getCalculationEngine()) { // New title $newTitle = $this->getTitle(); $this->parent->getCalculationEngine() @@ -1333,6 +1335,13 @@ public function getRowDimension(int $row): RowDimension return $this->rowDimensions[$row]; } + public function getRowStyle(int $row): ?Style + { + return $this->parent?->getCellXfByIndexOrNull( + ($this->rowDimensions[$row] ?? null)?->getXfIndex() + ); + } + public function rowDimensionExists(int $row): bool { return isset($this->rowDimensions[$row]); @@ -1376,6 +1385,13 @@ public function getColumnDimensionByColumn(int $columnIndex): ColumnDimension return $this->getColumnDimension(Coordinate::stringFromColumnIndex($columnIndex)); } + public function getColumnStyle(string $column): ?Style + { + return $this->parent?->getCellXfByIndexOrNull( + ($this->columnDimensions[$column] ?? null)?->getXfIndex() + ); + } + /** * Get styles. * @@ -1389,7 +1405,7 @@ public function getStyles(): array /** * Get style for cell. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellCoordinate + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellCoordinate * A simple string containing a cell address like 'A1' or a cell range like 'A1:E10' * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or a CellAddress or AddressRange object. @@ -1722,7 +1738,7 @@ public function getColumnBreaks(): array /** * Set merge on a cell range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10' + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10' * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or an AddressRange. * @param string $behaviour How the merged cells should behave. @@ -1847,7 +1863,7 @@ public function mergeCellBehaviour(Cell $cell, string $upperLeft, string $behavi /** * Remove merge on a cell range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10' + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10' * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or an AddressRange. * @@ -1898,7 +1914,7 @@ public function setMergeCells(array $mergeCells): static /** * Set protection on a cell or cell range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10' + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10' * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or a CellAddress or AddressRange object. * @param string $password Password to unlock the protection @@ -1921,7 +1937,7 @@ public function protectCells(AddressRange|CellAddress|int|string|array $range, s /** * Remove protection on a cell or cell range. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10' + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10' * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or a CellAddress or AddressRange object. * @@ -1979,7 +1995,7 @@ public function getAutoFilter(): AutoFilter /** * Set AutoFilter. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|AutoFilter|string $autoFilterOrRange + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|AutoFilter|string $autoFilterOrRange * A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or an AddressRange. @@ -2725,7 +2741,7 @@ public function setSelectedCell(string $coordinate): static /** * Select a range of cells. * - * @param AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $coordinate A simple string containing a Cell range like 'A1:E10' + * @param AddressRange|AddressRange|AddressRange|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $coordinate A simple string containing a Cell range like 'A1:E10' * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), * or a CellAddress or AddressRange object. * @@ -3730,7 +3746,9 @@ public function calculateArrays(bool $preCalculateFormulas = true): void $keys = $this->cellCollection->getCoordinates(); foreach ($keys as $key) { if ($this->getCell($key)->getDataType() === DataType::TYPE_FORMULA) { - $this->getCell($key)->getCalculatedValue(); + if (preg_match(self::FUNCTION_LIKE_GROUPBY, $this->getCell($key)->getValue()) !== 1) { + $this->getCell($key)->getCalculatedValue(); + } } } } diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php index d70a067f6f..3f4af3e325 100644 --- a/src/PhpSpreadsheet/Writer/Html.php +++ b/src/PhpSpreadsheet/Writer/Html.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\Cell\Cell; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; @@ -561,7 +562,7 @@ public function generateNavigation(): string $html .= '
    ' . PHP_EOL; foreach ($sheets as $sheet) { - $html .= '
  • ' . $sheet->getTitle() . '
    • ' . PHP_EOL; + $html .= '
  • ' . htmlspecialchars($sheet->getTitle()) . '
    • ' . PHP_EOL; ++$sheetId; } @@ -646,13 +647,13 @@ private function writeImageInCell(string $coordinates): string $filename = $drawing->getPath(); // Strip off eventual '.' - $filename = (string) preg_replace('/^[.]/', '', $filename); + $filename = Preg::replace('/^[.]/', '', $filename); // Prepend images root $filename = $this->getImagesRoot() . $filename; // Strip off eventual '.' if followed by non-/ - $filename = (string) preg_replace('@^[.]([^/])@', '$1', $filename); + $filename = Preg::replace('@^[.]([^/])@', '$1', $filename); // Convert UTF8 data to PCDATA $filename = htmlspecialchars($filename, Settings::htmlEntityFlags()); @@ -1411,7 +1412,7 @@ private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cel // Converts the cell content so that spaces occuring at beginning of each new line are replaced by   // Example: " Hello\n to the world" is converted to "  Hello\n to the world" - $cellData = (string) preg_replace('/(?m)(?:^|\\G) /', ' ', $cellData); + $cellData = Preg::replace('/(?m)(?:^|\\G) /', ' ', $cellData); // convert newline "\n" to '
    ' $cellData = nl2br($cellData); @@ -1565,7 +1566,7 @@ private function generateRowWriteCell( /** * Generate row. * - * @param array $values Array containing cells in a row + * @param array $values Array containing cells in a row * @param int $row Row number (0-based) * @param string $cellType eg: 'td' */ @@ -1577,7 +1578,19 @@ private function generateRow(Worksheet $worksheet, array $values, int $row, stri // Write cells $colNum = 0; - foreach ($values as $cellAddress) { + $tcpdfInited = false; + foreach ($values as $key => $cellAddress) { + if ($this instanceof Pdf\Mpdf) { + $colNum = $key - 1; + } elseif ($this instanceof Pdf\Tcpdf) { + // It appears that Tcpdf requires first cell in tr. + $colNum = $key - 1; + if (!$tcpdfInited && $key !== 1) { + $tempspan = ($colNum > 1) ? " colspan='$colNum'" : ''; + $html .= "\n"; + } + $tcpdfInited = true; + } [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($worksheet, $cellAddress, $row, $colNum); // Cell Data @@ -1587,12 +1600,17 @@ private function generateRow(Worksheet $worksheet, array $values, int $row, stri if ($worksheet->hyperlinkExists($coordinate) && !$worksheet->getHyperlink($coordinate)->isInternal()) { $url = $worksheet->getHyperlink($coordinate)->getUrl(); $urlDecode1 = html_entity_decode($url, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); - $urlTrim = preg_replace('/^\\s+/u', '', $urlDecode1) ?? $urlDecode1; - $parseScheme = preg_match('/^([\\w\\s]+):/u', strtolower($urlTrim), $matches); - if ($parseScheme === 1 && !in_array($matches[1], ['http', 'https', 'file', 'ftp', 's3'], true)) { + $urlTrim = Preg::replace('/^\\s+/u', '', $urlDecode1); + $parseScheme = Preg::isMatch('/^([\\w\\s]+):/u', strtolower($urlTrim), $matches); + if ($parseScheme && !in_array($matches[1], ['http', 'https', 'file', 'ftp', 'mailto', 's3'], true)) { $cellData = htmlspecialchars($url, Settings::htmlEntityFlags()); } else { - $cellData = '' . $cellData . ''; + $tooltip = $worksheet->getHyperlink($coordinate)->getTooltip(); + $tooltipOut = empty($tooltip) ? '' : (' title="' . htmlspecialchars($tooltip) . '"'); + $cellData = '' . $cellData . ''; } } @@ -1738,7 +1756,7 @@ public static function formatColorStatic(string $value, string $format): string $matches = []; $color_regex = '/^\\[[a-zA-Z]+\\]/'; - if (preg_match($color_regex, $format, $matches)) { + if (Preg::isMatch($color_regex, $format, $matches)) { $color = str_replace(['[', ']'], '', $matches[0]); $color = strtolower($color); } diff --git a/src/PhpSpreadsheet/Writer/Ods/Content.php b/src/PhpSpreadsheet/Writer/Ods/Content.php index 3b9cc82458..1c87385c57 100644 --- a/src/PhpSpreadsheet/Writer/Ods/Content.php +++ b/src/PhpSpreadsheet/Writer/Ods/Content.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Ods; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException; use PhpOffice\PhpSpreadsheet\Cell\Cell; @@ -227,16 +228,15 @@ private function writeCells(XMLWriter $objWriter, RowCellIterator $cells): void } } if (isset($attributes['ref'])) { - if (preg_match('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', (string) $attributes['ref'], $matches) == 1) { + if (Preg::isMatch('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', (string) $attributes['ref'], $matches)) { $matrixRowSpan = 1; $matrixColSpan = 1; if (isset($matches[3])) { $minRow = (int) $matches[2]; - // https://github.com/phpstan/phpstan/issues/11602 - $maxRow = (int) $matches[5]; // @phpstan-ignore-line + $maxRow = (int) $matches[5]; $matrixRowSpan = $maxRow - $minRow + 1; $minCol = Coordinate::columnIndexFromString($matches[1]); - $maxCol = Coordinate::columnIndexFromString($matches[4]); // @phpstan-ignore-line + $maxCol = Coordinate::columnIndexFromString($matches[4]); $matrixColSpan = $maxCol - $minCol + 1; } $objWriter->writeAttribute('table:number-matrix-columns-spanned', "$matrixColSpan"); diff --git a/src/PhpSpreadsheet/Writer/Ods/Formula.php b/src/PhpSpreadsheet/Writer/Ods/Formula.php index 335df56dd6..4a874c7b15 100644 --- a/src/PhpSpreadsheet/Writer/Ods/Formula.php +++ b/src/PhpSpreadsheet/Writer/Ods/Formula.php @@ -2,8 +2,10 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Ods; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\DefinedName; +use PhpOffice\PhpSpreadsheet\Shared\StringHelper; class Formula { @@ -33,14 +35,13 @@ public function convertFormula(string $formula, string $worksheetName = ''): str private function convertDefinedNames(string $formula): string { - $splitCount = preg_match_all( + $splitCount = Preg::matchAllWithOffsets( '/' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '/mui', $formula, - $splitRanges, - PREG_OFFSET_CAPTURE + $splitRanges ); - $lengths = array_map('strlen', array_column($splitRanges[0], 0)); + $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0)); $offsets = array_column($splitRanges[0], 1); $values = array_column($splitRanges[0], 0); @@ -60,14 +61,13 @@ private function convertDefinedNames(string $formula): string private function convertCellReferences(string $formula, string $worksheetName): string { - $splitCount = preg_match_all( + $splitCount = Preg::matchAllWithOffsets( '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui', $formula, - $splitRanges, - PREG_OFFSET_CAPTURE + $splitRanges ); - $lengths = array_map('strlen', array_column($splitRanges[0], 0)); + $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0)); $offsets = array_column($splitRanges[0], 1); $worksheets = $splitRanges[2]; @@ -76,7 +76,7 @@ private function convertCellReferences(string $formula, string $worksheetName): // Replace any commas in the formula with semi-colons for Ods // If by chance there are commas in worksheet names, then they will be "fixed" again in the loop - // because we've already extracted worksheet names with our preg_match_all() + // because we've already extracted worksheet names with our Preg::matchAllWithOffsets() $formula = str_replace(',', ';', $formula); while ($splitCount > 0) { --$splitCount; diff --git a/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php b/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php index 0fda160f31..3e622f20d2 100644 --- a/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php +++ b/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php @@ -2,8 +2,10 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Ods; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\DefinedName; +use PhpOffice\PhpSpreadsheet\Shared\StringHelper; use PhpOffice\PhpSpreadsheet\Shared\XMLWriter; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; @@ -80,14 +82,13 @@ private function writeNamedRange(DefinedName $definedName): void private function convertAddress(DefinedName $definedName, string $address): string { - $splitCount = preg_match_all( + $splitCount = Preg::matchAllWithOffsets( '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui', $address, - $splitRanges, - PREG_OFFSET_CAPTURE + $splitRanges ); - $lengths = array_map('strlen', array_column($splitRanges[0], 0)); + $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0)); $offsets = array_column($splitRanges[0], 1); $worksheets = $splitRanges[2]; diff --git a/src/PhpSpreadsheet/Writer/Ods/Settings.php b/src/PhpSpreadsheet/Writer/Ods/Settings.php index cfe1b598d9..695c604784 100644 --- a/src/PhpSpreadsheet/Writer/Ods/Settings.php +++ b/src/PhpSpreadsheet/Writer/Ods/Settings.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Ods; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Cell\CellAddress; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Shared\XMLWriter; @@ -97,7 +98,7 @@ private function writeWorksheetSettings(XMLWriter $objWriter, Worksheet $workshe private function writeSelectedCells(XMLWriter $objWriter, Worksheet $worksheet): void { $selected = $worksheet->getSelectedCells(); - if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) { + if (Preg::isMatch('/^([a-z]+)([0-9]+)/i', $selected, $matches)) { $colSel = Coordinate::columnIndexFromString($matches[1]) - 1; $rowSel = (int) $matches[2] - 1; $objWriter->startElement('config:config-item'); diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php index 422492d4e8..52b4ad3538 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Parser.php +++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xls; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\Shared\StringHelper; use PhpOffice\PhpSpreadsheet\Spreadsheet; @@ -45,7 +46,26 @@ class Parser // Invalid sheet title characters cannot occur in the sheet title: // *:/\?[] (usual invalid sheet title characters) // Single quote is represented as a pair '' - const REGEX_SHEET_TITLE_QUOTED = '(([^\*\:\/\\\\\?\[\]\\\'])+|(\\\'\\\')+)+'; + // Former value for this constant led to "catastrophic backtracking", + // unable to handle double apostrophes. + // (*COMMIT) should prevent this. + const REGEX_SHEET_TITLE_QUOTED = "([^*:/\\\\?\[\]']|'')+"; + + const REGEX_CELL_TITLE_QUOTED = "~^'" + . self::REGEX_SHEET_TITLE_QUOTED + . '(:' . self::REGEX_SHEET_TITLE_QUOTED . ')?' + . "'!(*COMMIT)" + . '[$]?[A-Ia-i]?[A-Za-z][$]?(\\d+)' + . '$~u'; + + const REGEX_RANGE_TITLE_QUOTED = "~^'" + . self::REGEX_SHEET_TITLE_QUOTED + . '(:' . self::REGEX_SHEET_TITLE_QUOTED . ')?' + . "'!(*COMMIT)" + . '[$]?[A-Ia-i]?[A-Za-z][$]?(\\d+)' + . ':' + . '[$]?[A-Ia-i]?[A-Za-z][$]?(\\d+)' + . '$~u'; /** * The index of the character we are currently looking at. @@ -478,34 +498,34 @@ public function __construct(Spreadsheet $spreadsheet) */ private function convert(string $token): string { - if (preg_match('/"([^"]|""){0,255}"/', $token)) { + if (Preg::isMatch('/"([^"]|""){0,255}"/', $token)) { return $this->convertString($token); } if (is_numeric($token)) { return $this->convertNumber($token); } // match references like A1 or $A$1 - if (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) { + if (Preg::isMatch('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) { return $this->convertRef2d($token); } // match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1 - if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) { + if (Preg::isMatch('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) { return $this->convertRef3d($token); } // match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1 - if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) { + if (self::matchCellSheetnameQuoted($token)) { return $this->convertRef3d($token); } // match ranges like A1:B2 or $A$1:$B$2 - if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) { + if (Preg::isMatch('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) { return $this->convertRange2d($token); } // match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2 - if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) { + if (Preg::isMatch('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) { return $this->convertRange3d($token); } // match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2 - if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)\\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)$/u", $token)) { + if (self::matchRangeSheetnameQuoted($token)) { return $this->convertRange3d($token); } // operators (including parentheses) @@ -513,14 +533,14 @@ private function convert(string $token): string return pack('C', $this->ptg[$token]); } // match error codes - if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') { + if (Preg::isMatch('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') { return $this->convertError($token); } - if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) { + if (Preg::isMatch('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) { return $this->convertDefinedName($token); } // commented so argument number can be processed correctly. See toReversePolish(). - /*if (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token)) + /*if (Preg::isMatch("/[A-Z0-9\xc0-\xdc\.]+/", $token)) { return($this->convertFunction($token, $this->_func_args)); }*/ @@ -528,10 +548,10 @@ private function convert(string $token): string if ($token == 'arg') { return ''; } - if (preg_match('/^true$/i', $token)) { + if (Preg::isMatch('/^true$/i', $token)) { return $this->convertBool(1); } - if (preg_match('/^false$/i', $token)) { + if (Preg::isMatch('/^false$/i', $token)) { return $this->convertBool(0); } @@ -547,7 +567,7 @@ private function convert(string $token): string private function convertNumber(mixed $num): string { // Integer in the range 0..2**16-1 - if ((preg_match('/^\\d+$/', (string) $num)) && ($num <= 65535)) { + if ((Preg::isMatch('/^\\d+$/', (string) $num)) && ($num <= 65535)) { return pack('Cv', $this->ptg['ptgInt'], $num); } @@ -613,7 +633,7 @@ private function convertRange2d(string $range, int $class = 0): string { // TODO: possible class value 0,1,2 check Formula.pm // Split the range into 2 cell refs - if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) { + if (Preg::isMatch('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) { [$cell1, $cell2] = explode(':', $range); } else { // TODO: use real error codes @@ -658,7 +678,7 @@ private function convertRange3d(string $token): string [$cell1, $cell2] = explode(':', $range ?? ''); // Convert the cell references - if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) { + if (Preg::isMatch('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) { [$row1, $col1] = $this->cellToPackedRowcol($cell1); [$row2, $col2] = $this->cellToPackedRowcol($cell2); } else { // It's a rows range (like 26:27) @@ -774,11 +794,11 @@ private function convertDefinedName(string $name): string */ private function getRefIndex(string $ext_ref): string { - $ext_ref = (string) preg_replace(["/^'/", "/'$/"], ['', ''], $ext_ref); // Remove leading and trailing ' if any. + $ext_ref = Preg::replace(["/^'/", "/'$/"], ['', ''], $ext_ref); // Remove leading and trailing ' if any. $ext_ref = str_replace('\'\'', '\'', $ext_ref); // Replace escaped '' with ' // Check if there is a sheet range eg., Sheet1:Sheet2. - if (preg_match('/:/', $ext_ref)) { + if (Preg::isMatch('/:/', $ext_ref)) { [$sheet_name1, $sheet_name2] = explode(':', $ext_ref); $sheet1 = $this->getSheetIndex($sheet_name1); @@ -894,7 +914,7 @@ private function cellToPackedRowcol(string $cell): array */ private function rangeToPackedRange(string $range): array { - if (preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match) !== 1) { + if (!Preg::isMatch('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match)) { // @codeCoverageIgnoreStart throw new WriterException('Regexp failure in rangeToPackedRange'); // @codeCoverageIgnoreEnd @@ -937,7 +957,7 @@ private function rangeToPackedRange(string $range): array */ private function cellToRowcol(string $cell): array { - if (preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match) !== 1) { + if (!Preg::isMatch('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match)) { // @codeCoverageIgnoreStart throw new WriterException('Regexp failure in cellToRowcol'); // @codeCoverageIgnoreEnd @@ -1053,52 +1073,109 @@ private function match(string $token): string } // if it's a reference A1 or $A$1 or $A1 or A$1 - if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.') && ($this->lookAhead !== '!')) { + if ( + Preg::isMatch('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token) + && !Preg::isMatch('/\d/', $this->lookAhead) + && ($this->lookAhead !== ':') + && ($this->lookAhead !== '.') + && ($this->lookAhead !== '!') + ) { return $token; } // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1) - if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')) { + if ( + Preg::isMatch('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token) + && !Preg::isMatch('/\d/', $this->lookAhead) + && ($this->lookAhead !== ':') + && ($this->lookAhead !== '.') + ) { return $token; } // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1) - if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')) { + if ( + self::matchCellSheetnameQuoted($token) + && !Preg::isMatch('/\\d/', $this->lookAhead) + && ($this->lookAhead !== ':') && ($this->lookAhead !== '.') + ) { return $token; } // if it's a range A1:A2 or $A$1:$A$2 - if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead)) { + if ( + Preg::isMatch( + '/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', + $token + ) + && !Preg::isMatch('/\d/', $this->lookAhead) + ) { return $token; } // If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2 - if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $token) && !preg_match('/\d/', $this->lookAhead)) { + if ( + Preg::isMatch( + '/^' + . self::REGEX_SHEET_TITLE_UNQUOTED + . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED + . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', + $token + ) + && !Preg::isMatch('/\d/', $this->lookAhead) + ) { return $token; } // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2 - if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $token) && !preg_match('/\d/', $this->lookAhead)) { + if ( + self::matchRangeSheetnameQuoted($token) + && !Preg::isMatch('/\\d/', $this->lookAhead) + ) { return $token; } // If it's a number (check that it's not a sheet name or range) if (is_numeric($token) && (!is_numeric($token . $this->lookAhead) || ($this->lookAhead == '')) && ($this->lookAhead !== '!') && ($this->lookAhead !== ':')) { return $token; } - if (preg_match('/"([^"]|""){0,255}"/', $token) && $this->lookAhead !== '"' && (substr_count($token, '"') % 2 == 0)) { + if ( + Preg::isMatch('/"([^"]|""){0,255}"/', $token) + && $this->lookAhead !== '"' + && (substr_count($token, '"') % 2 == 0) + ) { // If it's a string (of maximum 255 characters) return $token; } // If it's an error code - if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token === '#N/A') { + if ( + Preg::isMatch('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) + || $token === '#N/A' + ) { return $token; } // if it's a function call - if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) && ($this->lookAhead === '(')) { + if ( + Preg::isMatch("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) + && ($this->lookAhead === '(') + ) { return $token; } - if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token) && $this->spreadsheet->getDefinedName($token) !== null) { + if ( + Preg::isMatch( + '/^' + . Calculation::CALCULATION_REGEXP_DEFINEDNAME + . '$/miu', + $token + ) + && $this->spreadsheet->getDefinedName($token) !== null + ) { return $token; } - if (preg_match('/^true$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) { + if ( + Preg::isMatch('/^true$/i', $token) + && ($this->lookAhead === ')' || $this->lookAhead === ',') + ) { return $token; } - if (preg_match('/^false$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) { + if ( + Preg::isMatch('/^false$/i', $token) + && ($this->lookAhead === ')' || $this->lookAhead === ',') + ) { return $token; } if (str_ends_with($token, ')')) { @@ -1180,7 +1257,7 @@ private function condition(): array private function expression(): array { // If it's a string return a string node - if (preg_match('/"([^"]|""){0,255}"/', $this->currentToken)) { + if (Preg::isMatch('/"([^"]|""){0,255}"/', $this->currentToken)) { $tmp = str_replace('""', '"', $this->currentToken); if (($tmp == '"') || ($tmp == '')) { // Trap for "" that has been used for an empty string @@ -1190,12 +1267,17 @@ private function expression(): array $this->advance(); return $result; - } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) || $this->currentToken == '#N/A') { // error code + } + if ( + Preg::isMatch('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) + || $this->currentToken == '#N/A' + ) { // error code $result = $this->createTree($this->currentToken, 'ptgErr', ''); $this->advance(); return $result; - } elseif ($this->currentToken == '-') { // negative value + } + if ($this->currentToken == '-') { // negative value // catch "-" Term $this->advance(); $result2 = $this->expression(); @@ -1301,20 +1383,28 @@ private function fact(): array return $result; } // if it's a reference - if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $this->currentToken)) { + if (Preg::isMatch('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $this->currentToken)) { $result = $this->createTree($this->currentToken, '', ''); $this->advance(); return $result; } - if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) { + if ( + Preg::isMatch( + '/^' + . self::REGEX_SHEET_TITLE_UNQUOTED + . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED + . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', + $this->currentToken + ) + ) { // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1) $result = $this->createTree($this->currentToken, '', ''); $this->advance(); return $result; } - if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $this->currentToken)) { + if (self::matchCellSheetnameQuoted($this->currentToken)) { // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1) $result = $this->createTree($this->currentToken, '', ''); $this->advance(); @@ -1322,8 +1412,14 @@ private function fact(): array return $result; } if ( - preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken) - || preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken) + Preg::isMatch( + '/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', + $this->currentToken + ) + || Preg::isMatch( + '/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', + $this->currentToken + ) ) { // if it's a range A1:B2 or $A$1:$B$2 // must be an error? @@ -1332,7 +1428,16 @@ private function fact(): array return $result; } - if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $this->currentToken)) { + if ( + Preg::isMatch( + '/^' + . self::REGEX_SHEET_TITLE_UNQUOTED + . '(\\:' + . self::REGEX_SHEET_TITLE_UNQUOTED + . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', + $this->currentToken + ) + ) { // If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2) // must be an error? $result = $this->createTree($this->currentToken, '', ''); @@ -1340,7 +1445,7 @@ private function fact(): array return $result; } - if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $this->currentToken)) { + if (self::matchRangeSheetnameQuoted($this->currentToken)) { // If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2) // must be an error? $result = $this->createTree($this->currentToken, '', ''); @@ -1360,17 +1465,28 @@ private function fact(): array return $result; } - if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) { + if ( + Preg::isMatch("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) + && ($this->lookAhead === '(') + ) { // if it's a function call return $this->func(); } - if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $this->currentToken) && $this->spreadsheet->getDefinedName($this->currentToken) !== null) { + if ( + Preg::isMatch( + '/^' + . Calculation::CALCULATION_REGEXP_DEFINEDNAME + . '$/miu', + $this->currentToken + ) + && $this->spreadsheet->getDefinedName($this->currentToken) !== null + ) { $result = $this->createTree('ptgName', $this->currentToken, ''); $this->advance(); return $result; } - if (preg_match('/^true|false$/i', $this->currentToken)) { + if (Preg::isMatch('/^true|false$/i', $this->currentToken)) { $result = $this->createTree($this->currentToken, '', ''); $this->advance(); @@ -1491,9 +1607,12 @@ public function toReversePolish(array $tree = []): string } // if it's a function convert it here (so we can set it's arguments) if ( - preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value']) - && !preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value']) - && !preg_match('/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/', $tree['value']) + Preg::isMatch("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value']) + && !Preg::isMatch('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value']) + && !Preg::isMatch( + '/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/', + $tree['value'] + ) && !is_numeric($tree['value']) && !isset($this->ptg[$tree['value']]) ) { @@ -1511,4 +1630,20 @@ public function toReversePolish(array $tree = []): string return $polish . $converted_tree; } + + public static function matchCellSheetnameQuoted(string $token): bool + { + return Preg::isMatch( + self::REGEX_CELL_TITLE_QUOTED, + $token + ); + } + + public static function matchRangeSheetnameQuoted(string $token): bool + { + return Preg::isMatch( + self::REGEX_RANGE_TITLE_QUOTED, + $token + ); + } } diff --git a/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/src/PhpSpreadsheet/Writer/Xls/Workbook.php index c2b4496a53..43e9f1cd77 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Workbook.php +++ b/src/PhpSpreadsheet/Writer/Xls/Workbook.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xls; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\DefinedName; @@ -508,14 +509,13 @@ private function writeAllStyles(): void private function parseDefinedNameValue(DefinedName $definedName): string { $definedRange = $definedName->getValue(); - $splitCount = preg_match_all( + $splitCount = Preg::matchAllWithOffsets( '/' . Calculation::CALCULATION_REGEXP_CELLREF . '/mui', $definedRange, - $splitRanges, - PREG_OFFSET_CAPTURE + $splitRanges ); - $lengths = array_map('strlen', array_column($splitRanges[0], 0)); + $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0)); $offsets = array_column($splitRanges[0], 1); $worksheets = $splitRanges[2]; diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php index 5e3aa0b820..743f46d960 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php +++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xls; +use Composer\Pcre\Preg; use GdImage; use PhpOffice\PhpSpreadsheet\Cell\Cell; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; @@ -461,11 +462,11 @@ public function close(): void if (str_contains($url, 'sheet://')) { // internal to current workbook $url = str_replace('sheet://', 'internal:', $url); - } elseif (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) { + } elseif (Preg::isMatch('/^(http:|https:|ftp:|mailto:)/', $url)) { // URL - } elseif (!empty($hyperlinkbase) && preg_match('~^([A-Za-z]:)?[/\\\\]~', $url) !== 1) { + } elseif (!empty($hyperlinkbase) && !Preg::isMatch('~^([A-Za-z]:)?[/\\\\]~', $url)) { $url = "$hyperlinkbase$url"; - if (preg_match('/^(http:|https:|ftp:|mailto:)/', $url) !== 1) { + if (!Preg::isMatch('/^(http:|https:|ftp:|mailto:)/', $url)) { $url = 'external:' . $url; } } else { @@ -933,10 +934,10 @@ private function writeUrl(int $row, int $col, string $url): void private function writeUrlRange(int $row1, int $col1, int $row2, int $col2, string $url): void { // Check for internal/external sheet links or default to web link - if (preg_match('[^internal:]', $url)) { + if (Preg::isMatch('[^internal:]', $url)) { $this->writeUrlInternal($row1, $col1, $row2, $col2, $url); } - if (preg_match('[^external:]', $url)) { + if (Preg::isMatch('[^external:]', $url)) { $this->writeUrlExternal($row1, $col1, $row2, $col2, $url); } @@ -969,8 +970,7 @@ public function writeUrlWeb(int $row1, int $col1, int $row2, int $col2, string $ // Convert URL to a null terminated wchar string - /** @phpstan-ignore-next-line */ - $url = implode("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY)); + $url = implode("\0", Preg::split("''", $url, -1, PREG_SPLIT_NO_EMPTY)); $url = $url . "\0\0\0"; // Pack the length of the URL @@ -1003,7 +1003,7 @@ private function writeUrlInternal(int $row1, int $col1, int $row2, int $col2, st $record = 0x01B8; // Record identifier // Strip URL type - $url = (string) preg_replace('/^internal:/', '', $url); + $url = Preg::replace('/^internal:/', '', $url); // Pack the undocumented parts of the hyperlink stream $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000'); @@ -1050,7 +1050,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st { // Network drives are different. We will handle them separately // MS/Novell network drives and shares start with \\ - if (preg_match('[^external:\\\\]', $url)) { + if (Preg::isMatch('[^external:\\\\]', $url)) { return; } @@ -1058,7 +1058,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st // Strip URL type and change Unix dir separator to Dos style (if needed) // - $url = (string) preg_replace(['/^external:/', '/\//'], ['', '\\'], $url); + $url = Preg::replace(['/^external:/', '/\//'], ['', '\\'], $url); // Determine if the link is relative or absolute: // relative if link contains no dir separator, "somefile.xls" @@ -1066,7 +1066,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st // otherwise, absolute $absolute = 0x00; // relative path - if (preg_match('/^[A-Z]:/', $url)) { + if (Preg::isMatch('/^[A-Z]:/', $url)) { $absolute = 0x02; // absolute path on Windows, e.g. C:\... } $link_type = 0x01 | $absolute; @@ -1075,7 +1075,7 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st // parameters accordingly. // Split the dir name and sheet name (if it exists) $dir_long = $url; - if (preg_match('/\\#/', $url)) { + if (Preg::isMatch('/\\#/', $url)) { $link_type |= 0x08; } @@ -1083,11 +1083,11 @@ private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, st $link_type = pack('V', $link_type); // Calculate the up-level dir count e.g.. (..\..\..\ == 3) - $up_count = preg_match_all('/\\.\\.\\\\/', $dir_long, $useless); + $up_count = Preg::isMatchAll('/\\.\\.\\\\/', $dir_long, $useless); $up_count = pack('v', $up_count); // Store the short dos dir name (null terminated) - $dir_short = (string) preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0"; + $dir_short = Preg::replace('/\\.\\.\\\\/', '', $dir_long) . "\0"; // Store the long dir name as a wchar string (non-null terminated) //$dir_long = $dir_long . "\0"; @@ -2640,7 +2640,7 @@ private function writeDataValidity(): void $options |= $errorStyle << 4; // explicit formula? - if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) { + if ($type == 0x03 && Preg::isMatch('/^\".*\"$/', $dataValidation->getFormula1())) { $options |= 0x01 << 7; } diff --git a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php index 4dac1855e8..f8a70ea55a 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php @@ -2,10 +2,12 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx; +use Composer\Pcre\Preg; use Exception; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\DefinedName; +use PhpOffice\PhpSpreadsheet\Shared\StringHelper; use PhpOffice\PhpSpreadsheet\Shared\XMLWriter; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet; @@ -192,14 +194,13 @@ private function writeNamedRangeForPrintArea(ActualWorksheet $worksheet, int $wo private function getDefinedRange(DefinedName $definedName): string { $definedRange = $definedName->getValue(); - $splitCount = preg_match_all( + $splitCount = Preg::matchAllWithOffsets( '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui', $definedRange, - $splitRanges, - PREG_OFFSET_CAPTURE + $splitRanges ); - $lengths = array_map('strlen', array_column($splitRanges[0], 0)); + $lengths = array_map([StringHelper::class, 'strlenAllowNull'], array_column($splitRanges[0], 0)); $offsets = array_column($splitRanges[0], 1); $worksheets = $splitRanges[2]; diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php index 8a17eb9f16..ed441b1686 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces; use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing; @@ -507,7 +508,7 @@ public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\W private function writeVMLHeaderFooterImage(XMLWriter $objWriter, string $reference, HeaderFooterDrawing $image): void { // Calculate object id - if (preg_match('{(\d+)}', md5($reference), $m) !== 1) { + if (!Preg::isMatch('{(\d+)}', md5($reference), $m)) { // @codeCoverageIgnoreStart throw new WriterException('Regexp failure in writeVMLHeaderFooterImage'); // @codeCoverageIgnoreEnd diff --git a/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php b/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php index a563bd9130..31e1e3e0b2 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Calculation; class FunctionPrefix @@ -142,6 +143,7 @@ class FunctionPrefix . '|drop' . '|expand' . '|filter' + . '|groupby' . '|hstack' . '|isomitted' . '|lambda' @@ -183,7 +185,7 @@ class FunctionPrefix */ protected static function addXlfnPrefix(string $functionString): string { - return (string) preg_replace(self::XLFNREGEXP, '_xlfn.$1(', $functionString); + return Preg::replace(self::XLFNREGEXP, '_xlfn.$1(', $functionString); } /** @@ -191,7 +193,7 @@ protected static function addXlfnPrefix(string $functionString): string */ protected static function addXlwsPrefix(string $functionString): string { - return (string) preg_replace(self::XLWSREGEXP, '_xlws.$1(', $functionString); + return Preg::replace(self::XLWSREGEXP, '_xlws.$1(', $functionString); } /** @@ -199,9 +201,9 @@ protected static function addXlwsPrefix(string $functionString): string */ public static function addFunctionPrefix(string $functionString): string { - $functionString = (string) preg_replace_callback( + $functionString = Preg::replaceCallback( Calculation::CALCULATION_REGEXP_CELLREF_SPILL, - fn (array $matches) => 'ANCHORARRAY(' . substr($matches[0], 0, -1) . ')', + fn (array $matches) => 'ANCHORARRAY(' . substr((string) $matches[0], 0, -1) . ')', $functionString ); diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php index 98ee0bd31e..f3cfac22c8 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx; +use Composer\Pcre\Preg; use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue; use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError; use PhpOffice\PhpSpreadsheet\Cell\Cell; @@ -1541,18 +1542,17 @@ private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell private function parseRef(string $coordinate, string $ref): string { - if (preg_match('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', $ref, $matches) !== 1) { + if (!Preg::isMatch('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', $ref, $matches)) { return $ref; } if (!isset($matches[3])) { // single cell, not range return $coordinate; } $minRow = (int) $matches[2]; - // https://github.com/phpstan/phpstan/issues/11602 - $maxRow = (int) $matches[5]; // @phpstan-ignore-line + $maxRow = (int) $matches[5]; $rows = $maxRow - $minRow + 1; $minCol = Coordinate::columnIndexFromString($matches[1]); - $maxCol = Coordinate::columnIndexFromString($matches[4]); // @phpstan-ignore-line + $maxCol = Coordinate::columnIndexFromString($matches[4]); $cols = $maxCol - $minCol + 1; $firstCellArray = Coordinate::indexesFromString($coordinate); $lastRow = $firstCellArray[1] + $rows - 1; @@ -1584,7 +1584,11 @@ private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksh $mappedType = $pCell->getDataType(); if ($mappedType === DataType::TYPE_FORMULA) { if ($this->useDynamicArrays) { - $tempCalc = $pCell->getCalculatedValue(); + if (preg_match(PhpspreadsheetWorksheet::FUNCTION_LIKE_GROUPBY, $cellValue) === 1) { + $tempCalc = []; + } else { + $tempCalc = $pCell->getCalculatedValue(); + } if (is_array($tempCalc)) { $objWriter->writeAttribute('cm', '1'); } diff --git a/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php b/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php index 10da1dd21c..f15352aee9 100644 --- a/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php +++ b/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php @@ -43,6 +43,7 @@ public function testCreateColumnRangeWithWorksheet(): void self::assertSame('E', $columnRange->to()); self::assertSame("'Mark''s Worksheet'!C:E", (string) $columnRange); self::assertSame("'Mark''s Worksheet'!C1:E1048576", (string) $columnRange->toCellRange()); + $spreadsheet->disconnectWorksheets(); } public function testCreateColumnRangeFromArray(): void @@ -88,4 +89,23 @@ public function testColumnRangePrevious(): void // Check that original Column Range isn't changed self::assertSame('C:E', (string) $columnRange); } + + public function testIssue4309(): void + { + $spreadsheet = new Spreadsheet(); + $sheet = $spreadsheet->getActiveSheet(); + $columnRange = new ColumnRange('A', 'A'); + $columnStyle = $sheet->getStyle($columnRange); + $columnStyle->applyFromArray([ + 'font' => ['bold' => true], + ]); + $columnXf = $sheet->getColumnDimension('A')->getXfIndex(); + self::assertNotNull($columnXf); + self::assertTrue( + $spreadsheet->getCellXfByIndex($columnXf) + ->getFont()->getBold() + ); + + $spreadsheet->disconnectWorksheets(); + } } diff --git a/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php b/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php index 52fd357f51..005f1af6b2 100644 --- a/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php +++ b/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php @@ -39,6 +39,7 @@ public function testCreateRowRangeWithWorksheet(): void self::assertSame(3, $rowRange->from()); self::assertSame(5, $rowRange->to()); self::assertSame("'Mark''s Worksheet'!3:5", (string) $rowRange); + $spreadsheet->disconnectWorksheets(); } public function testCreateRowRangeFromArray(): void @@ -74,4 +75,20 @@ public function testRowRangePrevious(): void // Check that original Row Range isn't changed self::assertSame('3:5', (string) $rowRange); } + + public function testIssue4309(): void + { + $spreadsheet = new Spreadsheet(); + $sheet = $spreadsheet->getActiveSheet(); + $rowRange = new RowRange(1, 1); + $rowStyle = $sheet->getStyle($rowRange); + $rowStyle->applyFromArray([ + 'font' => ['name' => 'Arial'], + ]); + $rowXf = $sheet->getRowDimension(1)->getXfIndex(); + self::assertNotNull($rowXf); + self::assertSame('Arial', $spreadsheet->getCellXfByIndex($rowXf)->getFont()->getName()); + + $spreadsheet->disconnectWorksheets(); + } } diff --git a/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php b/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php index 7aa484d9cb..2546d60de6 100644 --- a/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php +++ b/tests/PhpSpreadsheetTests/Chart/ChartsDynamicTitleTest.php @@ -34,7 +34,6 @@ public function writeCharts(XlsxWriter $writer): void $writer->setIncludeCharts(true); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] public function testDynamicTitle(): void { // based on samples/templates/issue.3797.2007.xlsx diff --git a/tests/PhpSpreadsheetTests/Document/PropertiesTest.php b/tests/PhpSpreadsheetTests/Document/PropertiesTest.php index 1b32aeaec9..dd8dabb21f 100644 --- a/tests/PhpSpreadsheetTests/Document/PropertiesTest.php +++ b/tests/PhpSpreadsheetTests/Document/PropertiesTest.php @@ -8,6 +8,7 @@ use DateTimeZone; use PhpOffice\PhpSpreadsheet\Document\Properties; use PhpOffice\PhpSpreadsheet\Shared\Date; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; class PropertiesTest extends TestCase @@ -16,7 +17,7 @@ class PropertiesTest extends TestCase private float $startTime; - protected function setup(): void + protected function setUp(): void { do { // loop to avoid rare situation where timestamp changes @@ -44,12 +45,19 @@ public function testSetCreator(): void self::assertSame($creator, $this->properties->getCreator()); } - #[\PHPUnit\Framework\Attributes\DataProvider('providerCreationTime')] + #[DataProvider('providerCreationTime')] public function testSetCreated(null|int $expectedCreationTime, null|int|string $created): void { - $expectedCreationTime = $expectedCreationTime ?? $this->startTime; - - $this->properties->setCreated($created); + if ($expectedCreationTime === null) { + do { + // loop to avoid rare situation where timestamp changes + $expectedCreationTime = (float) (new DateTime())->format('U'); + $this->properties->setCreated($created); + $endTime = (float) (new DateTime())->format('U'); + } while ($expectedCreationTime !== $endTime); + } else { + $this->properties->setCreated($created); + } self::assertEquals($expectedCreationTime, $this->properties->getCreated()); } @@ -71,12 +79,19 @@ public function testSetModifier(): void self::assertSame($creator, $this->properties->getLastModifiedBy()); } - #[\PHPUnit\Framework\Attributes\DataProvider('providerModifiedTime')] + #[DataProvider('providerModifiedTime')] public function testSetModified(mixed $expectedModifiedTime, null|int|string $modified): void { - $expectedModifiedTime = $expectedModifiedTime ?? $this->startTime; - - $this->properties->setModified($modified); + if ($expectedModifiedTime === null) { + do { + // loop to avoid rare situation where timestamp changes + $expectedModifiedTime = (float) (new DateTime())->format('U'); + $this->properties->setModified($modified); + $endTime = (float) (new DateTime())->format('U'); + } while ($expectedModifiedTime !== $endTime); + } else { + $this->properties->setModified($modified); + } self::assertEquals($expectedModifiedTime, $this->properties->getModified()); } @@ -146,7 +161,7 @@ public function testSetManager(): void self::assertSame($manager, $this->properties->getManager()); } - #[\PHPUnit\Framework\Attributes\DataProvider('providerCustomProperties')] + #[DataProvider('providerCustomProperties')] public function testSetCustomProperties(mixed $expectedType, mixed $expectedValue, string $propertyName, null|bool|float|int|string $propertyValue, ?string $propertyType = null): void { if ($propertyType === null) { diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php new file mode 100644 index 0000000000..8246784bf3 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Reader/Ods/FormulaTranslatorTest.php @@ -0,0 +1,62 @@ + ["'sheet1.bug'!a1:a5", "'sheet1.bug'.a1:'sheet1.bug'.a5"], + 'range special chars and period in sheet name' => ["'#sheet1.x'!a1:a5", "'#sheet1.x'.a1:'#sheet1.x'.a5"], + 'cell period in sheet name' => ["'sheet1.bug'!b9", "'sheet1.bug'.b9"], + 'range unquoted sheet name' => ['sheet1!b9:c12', 'sheet1.b9:sheet1.c12'], + 'range unquoted sheet name with $' => ['sheet1!$b9:c$12', 'sheet1.$b9:sheet1.c$12'], + 'range quoted sheet name with $' => ["'sheet1'!\$b9:c\$12", '\'sheet1\'.$b9:\'sheet1\'.c$12'], + 'cell unquoted sheet name' => ['sheet1!B$9', 'sheet1.B$9'], + 'range no sheet name all dollars' => ['$B$9:$C$12', '$B$9:$C$12'], + 'range no sheet name some dollars' => ['B$9:$C12', 'B$9:$C12'], + 'range no sheet name no dollars' => ['B9:C12', 'B9:C12'], + ]; + } + + #[DataProvider('formulaProvider')] + public function testFormulas(string $result, string $formula): void + { + self::assertSame($result, FormulaTranslator::convertToExcelFormulaValue($formula)); + } + + public static function formulaProvider(): array + { + return [ + 'ranges no sheet name' => [ + 'SUM(A5:A7,B$5:$B7)', + 'SUM([.A5:.A7];[.B$5:.$B7])', + ], + 'ranges sheet name with period' => [ + 'SUM(\'test.bug\'!A5:A7,\'test.bug\'!B5:B7)', + 'SUM([\'test.bug\'.A5:.A7];[\'test.bug\'.B5:.B7])', + ], + 'ranges unquoted sheet name' => [ + 'SUM(testbug!A5:A7,testbug!B5:B7)', + 'SUM([testbug.A5:.A7];[testbug.B5:.B7])', + ], + 'ranges quoted sheet name without period' => [ + 'SUM(\'testbug\'!A5:A7,\'testbug\'!B5:B7)', + 'SUM([\'testbug\'.A5:.A7];[\'testbug\'.B5:.B7])', + ], + ]; + } +} diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php new file mode 100644 index 0000000000..e41b2190ed --- /dev/null +++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/GroupByLimitedTest.php @@ -0,0 +1,33 @@ +load(self::$testbook); + $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx'); + $spreadsheet->disconnectWorksheets(); + $reloadedSheet = $reloadedSpreadsheet->getActiveSheet(); + self::assertSame(['t' => 'array', 'ref' => 'E3:F7'], $reloadedSheet->getCell('E3')->getFormulaAttributes()); + $expected = [ + ['Design', '$505,000 '], + ['Development', '$346,000 '], + ['Marketing', '$491,000 '], + ['Research', '$573,000 '], + ['Total', '$1,915,000 '], + [null, null], + ]; + self::assertSame($expected, $reloadedSheet->rangeToArray('E3:F8')); + $reloadedSpreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php b/tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php new file mode 100644 index 0000000000..b84026700e --- /dev/null +++ b/tests/PhpSpreadsheetTests/SpreadsheetDuplicateSheetTest.php @@ -0,0 +1,59 @@ +spreadsheet !== null) { + $this->spreadsheet->disconnectWorksheets(); + $this->spreadsheet = null; + } + } + + public function testDuplicate(): void + { + $this->spreadsheet = new Spreadsheet(); + $sheet = $this->spreadsheet->getActiveSheet(); + $sheet->setTitle('original'); + $sheet->getCell('A1')->setValue('text1'); + $sheet->getCell('A2')->setValue('text2'); + $sheet->getStyle('A1') + ->getFont() + ->setBold(true); + $sheet3 = $this->spreadsheet->createSheet(); + $sheet3->setTitle('added'); + $newSheet = $this->spreadsheet + ->duplicateWorksheetByTitle('original'); + $this->spreadsheet->duplicateWorksheetByTitle('added'); + self::assertSame('original 1', $newSheet->getTitle()); + self::assertSame( + 'text1', + $newSheet->getCell('A1')->getValue() + ); + self::assertSame( + 'text2', + $newSheet->getCell('A2')->getValue() + ); + self::assertTrue( + $newSheet->getStyle('A1')->getFont()->getBold() + ); + self::assertFalse( + $newSheet->getStyle('A2')->getFont()->getBold() + ); + $sheetNames = []; + foreach ($this->spreadsheet->getWorksheetIterator() as $worksheet) { + $sheetNames[] = $worksheet->getTitle(); + } + $expected = ['original', 'original 1', 'added', 'added 1']; + self::assertSame($expected, $sheetNames); + } +} diff --git a/tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php b/tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php new file mode 100644 index 0000000000..d5197fb9c7 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Worksheet/ColumnRowStyleTest.php @@ -0,0 +1,63 @@ +getActiveSheet(); + $columnStyle = $sheet->getStyle('B:C'); + $columnStyle->applyFromArray([ + 'font' => ['name' => 'Who knows'], + ]); + self::assertSame( + 'Who knows', + $sheet->getColumnStyle('B')?->getFont()->getName() + ); + self::assertSame( + 'Who knows', + $sheet->getColumnStyle('C')?->getFont()->getName() + ); + self::assertNull( + $sheet->getColumnStyle('A')?->getFont()->getName() + ); + self::assertNull( + $sheet->getColumnStyle('D')?->getFont()->getName() + ); + + $spreadsheet->disconnectWorksheets(); + } + + public function testRowStyle(): void + { + $spreadsheet = new Spreadsheet(); + $sheet = $spreadsheet->getActiveSheet(); + $rowStyle = $sheet->getStyle('2:3'); + $rowStyle->applyFromArray([ + 'font' => ['name' => 'Who knows'], + ]); + self::assertSame( + 'Who knows', + $sheet->getRowStyle(2)?->getFont()->getName() + ); + self::assertSame( + 'Who knows', + $sheet->getRowStyle(3)?->getFont()->getName() + ); + self::assertNull( + $sheet->getRowStyle(1)?->getFont()->getName() + ); + self::assertNull( + $sheet->getRowStyle(4)?->getFont()->getName() + ); + + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php b/tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php new file mode 100644 index 0000000000..bbb6c8bf00 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Worksheet/Issue641Test.php @@ -0,0 +1,82 @@ +removeSheetByIndex(0); + $availableWs = []; + + $worksheet = $xlsx->createSheet(); + $worksheet->setTitle('Condensed A'); + $worksheet->getCell('A1')->setValue("=SUM('Detailed A'!A1:A10)"); + $worksheet->getCell('A2')->setValue(mt_rand(1, 30)); + $availableWs[] = 'Condensed A'; + + $worksheet = $xlsx->createSheet(); + $worksheet->setTitle('Condensed B'); + $worksheet->getCell('A1')->setValue("=SUM('Detailed B'!A1:A10)"); + $worksheet->getCell('A2')->setValue(mt_rand(1, 30)); + $availableWs[] = 'Condensed B'; + + // at this point the value in worksheet 'Condensed B' cell A1 is + // =SUM('Detailed B'!A1:A10) + + // worksheet in question is cloned and totals are attached + $totalWs1 = clone $xlsx->getSheet($xlsx->getSheetCount() - 1); + $totalWs1->setTitle('Condensed Total'); + $xlsx->addSheet($totalWs1); + $formula = '='; + foreach ($availableWs as $ws) { + $formula .= sprintf("+'%s'!A2", $ws); + } + $totalWs1->getCell('A1')->setValue("=SUM('Detailed Total'!A1:A10)"); + $totalWs1->getCell('A2')->setValue($formula); + + $availableWs = []; + + $worksheet = $xlsx->createSheet(); + $worksheet->setTitle('Detailed A'); + for ($step = 1; $step <= 10; ++$step) { + $worksheet->getCell("A{$step}")->setValue(mt_rand(1, 30)); + } + $availableWs[] = 'Detailed A'; + + $worksheet = $xlsx->createSheet(); + $worksheet->setTitle('Detailed B'); + for ($step = 1; $step <= 10; ++$step) { + $worksheet->getCell("A{$step}")->setValue(mt_rand(1, 30)); + } + $availableWs[] = 'Detailed B'; + + $totalWs2 = clone $xlsx->getSheet($xlsx->getSheetCount() - 1); + $totalWs2->setTitle('Detailed Total'); + $xlsx->addSheet($totalWs2); + + for ($step = 1; $step <= 10; ++$step) { + $formula = '='; + foreach ($availableWs as $ws) { + $formula .= sprintf("+'%s'!A%s", $ws, $step); + } + $totalWs2->getCell("A{$step}")->setValue($formula); + } + + self::assertSame("=SUM('Detailed A'!A1:A10)", $xlsx->getSheetByName('Condensed A')?->getCell('A1')?->getValue()); + self::assertSame("=SUM('Detailed B'!A1:A10)", $xlsx->getSheetByName('Condensed B')?->getCell('A1')?->getValue()); + self::assertSame("=SUM('Detailed Total'!A1:A10)", $xlsx->getSheetByName('Condensed Total')?->getCell('A1')?->getValue()); + self::assertSame("=+'Detailed A'!A1+'Detailed B'!A1", $xlsx->getSheetByName('Detailed Total')?->getCell('A1')?->getValue()); + + $xlsx->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php new file mode 100644 index 0000000000..c27545ea57 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Writer/Dompdf/HideMergeTest.php @@ -0,0 +1,142 @@ +getActiveSheet(); + // just some labels for better visualisation of the problem + $worksheet->setCellValue('A1', 'A'); + $worksheet->setCellValue('B1', 'B'); + $worksheet->setCellValue('C1', 'C'); + // setting the row height to better visualize the problem + for ($i = 1; $i <= 10; ++$i) { + $worksheet->getRowDimension($i)->setRowHeight(17); + } + // Headline - merged over two cells AND two rows + $worksheet->mergeCells('B2:C3'); + $worksheet->setCellValue('B2', 'Hello World Headline'); + $worksheet->getStyle('B2:C3')->getFont()->setBold(true); + $worksheet->getStyle('B2:C3') + ->getAlignment() + ->setHorizontal(Alignment::HORIZONTAL_CENTER); + $worksheet->getStyle('B2:C3') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 1 - merge over two rows + $worksheet->mergeCells('B4:B5'); + $worksheet->mergeCells('C4:C5'); + $worksheet->setCellValue('B4', 'Label 1'); + $worksheet->setCellValue('C4', 'Text 1'); + $worksheet->getStyle('B4:B5')->getFont()->setBold(true); + $worksheet->getStyle('B4:C5') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B4:B5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C4:C5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 2 - merge over two rows + $worksheet->mergeCells('B6:B7'); + $worksheet->mergeCells('C6:C7'); + $worksheet->setCellValue('B6', 'Label 2'); + $worksheet->setCellValue('C6', 'Text 2'); + $worksheet->getStyle('B6:B7')->getFont()->setBold(true); + $worksheet->getStyle('B6:C7') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B6:B7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C6:C7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // This is where the error was introduced (!!!) + $worksheet->getColumnDimension('A')->setVisible(false); + $Dompdf = new Dompdf($spreadsheet); + $html = $Dompdf->generateHtmlAll(); + $html = preg_replace('/^\\s+/m', '', $html) ?? $html; + $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html; + self::assertStringContainsString( + 'table.sheet0 .column0 { display:none }', + $html + ); + self::assertStringContainsString( + '' + . 'A' + . 'B' + . 'C' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . 'Hello World Headline' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . 'Label 1' + . 'Text 1' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . 'Label 2' + . 'Text 2' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . '', + $html + ); + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php new file mode 100644 index 0000000000..1075bcca2b --- /dev/null +++ b/tests/PhpSpreadsheetTests/Writer/Html/HideMergeTest.php @@ -0,0 +1,142 @@ +getActiveSheet(); + // just some labels for better visualisation of the problem + $worksheet->setCellValue('A1', 'A'); + $worksheet->setCellValue('B1', 'B'); + $worksheet->setCellValue('C1', 'C'); + // setting the row height to better visualize the problem + for ($i = 1; $i <= 10; ++$i) { + $worksheet->getRowDimension($i)->setRowHeight(17); + } + // Headline - merged over two cells AND two rows + $worksheet->mergeCells('B2:C3'); + $worksheet->setCellValue('B2', 'Hello World Headline'); + $worksheet->getStyle('B2:C3')->getFont()->setBold(true); + $worksheet->getStyle('B2:C3') + ->getAlignment() + ->setHorizontal(Alignment::HORIZONTAL_CENTER); + $worksheet->getStyle('B2:C3') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 1 - merge over two rows + $worksheet->mergeCells('B4:B5'); + $worksheet->mergeCells('C4:C5'); + $worksheet->setCellValue('B4', 'Label 1'); + $worksheet->setCellValue('C4', 'Text 1'); + $worksheet->getStyle('B4:B5')->getFont()->setBold(true); + $worksheet->getStyle('B4:C5') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B4:B5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C4:C5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 2 - merge over two rows + $worksheet->mergeCells('B6:B7'); + $worksheet->mergeCells('C6:C7'); + $worksheet->setCellValue('B6', 'Label 2'); + $worksheet->setCellValue('C6', 'Text 2'); + $worksheet->getStyle('B6:B7')->getFont()->setBold(true); + $worksheet->getStyle('B6:C7') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B6:B7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C6:C7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // This is where the error was introduced (!!!) + $worksheet->getColumnDimension('A')->setVisible(false); + $Dompdf = new Html($spreadsheet); + $html = $Dompdf->generateHtmlAll(); + $html = preg_replace('/^\\s+/m', '', $html) ?? $html; + $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html; + self::assertStringContainsString( + 'table.sheet0 .column0 { display:none }', + $html + ); + self::assertStringContainsString( + '' + . 'A' + . 'B' + . 'C' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . 'Hello World Headline' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . 'Label 1' + . 'Text 1' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . 'Label 2' + . 'Text 2' + . '', + $html + ); + self::assertStringContainsString( + '' + . ' ' + . '', + $html + ); + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php b/tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php new file mode 100644 index 0000000000..e9f250d37f --- /dev/null +++ b/tests/PhpSpreadsheetTests/Writer/Html/MailtoTest.php @@ -0,0 +1,32 @@ +getActiveSheet(); + $worksheet->setCellValue('A1', 'Mail Me!'); + $worksheet->getCell('A1') + ->getHyperlink() + ->setUrl('mailto:me@example.com'); + $worksheet->setCellValue('A2', 'Mail You!'); + $worksheet->getCell('A2') + ->getHyperlink() + ->setTooltip('go ahead') + ->setUrl('mailto:you@example.com'); + $writer = new HtmlWriter($spreadsheet); + $html = $writer->generateHtmlAll(); + self::assertStringContainsString('Mail Me!', $html); + self::assertStringContainsString('Mail You!', $html); + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php b/tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php new file mode 100644 index 0000000000..284fd9f4e5 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Writer/Html/NavigationBadTitleTest.php @@ -0,0 +1,35 @@ +getActiveSheet(); + $sheet->getCell('A1')->setValue(1); + $sheet2 = $spreadsheet->createSheet(); + $sheet2->setTitle(''); + $sheet2->getCell('A2')->setValue(2); + + $writer = new HtmlWriter($spreadsheet); + $writer->writeAllSheets(); + $html = $writer->generateHTMLAll(); + $expected = ''; + self::assertStringContainsString($expected, $html, 'appropriate characters are escaped'); + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php b/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php index 7b1a633bc1..cc0511d4fe 100644 --- a/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Html/NoJavascriptLinksTest.php @@ -25,7 +25,7 @@ public function testNoJavascriptLinks(): void $writer = new Html($spreadsheet); $html = $writer->generateHTMLAll(); - self::assertStringContainsString('Click me', $html, 'http hyperlink retained'); + self::assertStringContainsString('Click me', $html, 'http hyperlink retained'); self::assertStringContainsString('javascript:alert(\'hello1\')', $html, 'javascript hyperlink dropped'); self::assertStringContainsString('javascript:alert(\'hello2\')', $html, 'javascript hyperlink function dropped'); $spreadsheet->disconnectWorksheets(); diff --git a/tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php new file mode 100644 index 0000000000..a3b789d982 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Writer/Mpdf/HideMergeTest.php @@ -0,0 +1,131 @@ +getActiveSheet(); + // just some labels for better visualisation of the problem + $worksheet->setCellValue('A1', 'A'); + $worksheet->setCellValue('B1', 'B'); + $worksheet->setCellValue('C1', 'C'); + // setting the row height to better visualize the problem + for ($i = 1; $i <= 10; ++$i) { + $worksheet->getRowDimension($i)->setRowHeight(17); + } + // Headline - merged over two cells AND two rows + $worksheet->mergeCells('B2:C3'); + $worksheet->setCellValue('B2', 'Hello World Headline'); + $worksheet->getStyle('B2:C3')->getFont()->setBold(true); + $worksheet->getStyle('B2:C3') + ->getAlignment() + ->setHorizontal(Alignment::HORIZONTAL_CENTER); + $worksheet->getStyle('B2:C3') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 1 - merge over two rows + $worksheet->mergeCells('B4:B5'); + $worksheet->mergeCells('C4:C5'); + $worksheet->setCellValue('B4', 'Label 1'); + $worksheet->setCellValue('C4', 'Text 1'); + $worksheet->getStyle('B4:B5')->getFont()->setBold(true); + $worksheet->getStyle('B4:C5') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B4:B5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C4:C5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 2 - merge over two rows + $worksheet->mergeCells('B6:B7'); + $worksheet->mergeCells('C6:C7'); + $worksheet->setCellValue('B6', 'Label 2'); + $worksheet->setCellValue('C6', 'Text 2'); + $worksheet->getStyle('B6:B7')->getFont()->setBold(true); + $worksheet->getStyle('B6:C7') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B6:B7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C6:C7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // This is where the error was introduced (!!!) + $worksheet->getColumnDimension('A')->setVisible(false); + $mpdf = new Mpdf($spreadsheet); + $html = $mpdf->generateHtmlAll(); + $html = preg_replace('/^\\s+/m', '', $html) ?? $html; + $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html; + self::assertStringContainsString( + '' + . 'B' + . 'C' + . '', + $html + ); + self::assertStringContainsString( + '' + . 'Hello World Headline' + . '', + $html + ); + self::assertStringContainsString( + '' + . '', + $html + ); + self::assertStringContainsString( + '' + . 'Label 1' + . 'Text 1' + . '', + $html + ); + self::assertStringContainsString( + '' + . '', + $html + ); + self::assertStringContainsString( + '' + . 'Label 2' + . 'Text 2' + . '', + $html + ); + self::assertStringContainsString( + '' + . '', + $html + ); + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php b/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php index ddfe85570a..952db5cb5b 100644 --- a/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Ods/AutoFilterTest.php @@ -32,4 +32,29 @@ public function testAutoFilterWriter(): void self::assertSame('A1:C9', $reloaded->getActiveSheet()->getAutoFilter()->getRange()); } + + public function testPeriodInSheetNames(): void + { + $spreadsheet = new Spreadsheet(); + $worksheet = $spreadsheet->getActiveSheet(); + $worksheet->setTitle('work.sheet'); + + $dataSet = [ + ['Year', 'Quarter', 'Sales'], + [2020, 'Q1', 100], + [2020, 'Q2', 120], + [2020, 'Q3', 140], + [2020, 'Q4', 160], + [2021, 'Q1', 180], + [2021, 'Q2', 75], + [2021, 'Q3', 0], + [2021, 'Q4', 0], + ]; + $worksheet->fromArray($dataSet, null, 'A1'); + $worksheet->getAutoFilter()->setRange('A1:C9'); + + $reloaded = $this->writeAndReload($spreadsheet, 'Ods'); + + self::assertSame('A1:C9', $reloaded->getActiveSheet()->getAutoFilter()->getRange()); + } } diff --git a/tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php b/tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php new file mode 100644 index 0000000000..7b8673489e --- /dev/null +++ b/tests/PhpSpreadsheetTests/Writer/Tcpdf/HideMergeTest.php @@ -0,0 +1,127 @@ +getActiveSheet(); + // just some labels for better visualisation of the problem + $worksheet->setCellValue('A1', 'A'); + $worksheet->setCellValue('B1', 'B'); + $worksheet->setCellValue('C1', 'C'); + // setting the row height to better visualize the problem + for ($i = 1; $i <= 10; ++$i) { + $worksheet->getRowDimension($i)->setRowHeight(17); + } + // Headline - merged over two cells AND two rows + $worksheet->mergeCells('B2:C3'); + $worksheet->setCellValue('B2', 'Hello World Headline'); + $worksheet->getStyle('B2:C3')->getFont()->setBold(true); + $worksheet->getStyle('B2:C3') + ->getAlignment() + ->setHorizontal(Alignment::HORIZONTAL_CENTER); + $worksheet->getStyle('B2:C3') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 1 - merge over two rows + $worksheet->mergeCells('B4:B5'); + $worksheet->mergeCells('C4:C5'); + $worksheet->setCellValue('B4', 'Label 1'); + $worksheet->setCellValue('C4', 'Text 1'); + $worksheet->getStyle('B4:B5')->getFont()->setBold(true); + $worksheet->getStyle('B4:C5') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B4:B5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C4:C5') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // Content 2 - merge over two rows + $worksheet->mergeCells('B6:B7'); + $worksheet->mergeCells('C6:C7'); + $worksheet->setCellValue('B6', 'Label 2'); + $worksheet->setCellValue('C6', 'Text 2'); + $worksheet->getStyle('B6:B7')->getFont()->setBold(true); + $worksheet->getStyle('B6:C7') + ->getAlignment() + ->setVertical(Alignment::VERTICAL_CENTER); + $worksheet->getStyle('B6:B7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + $worksheet->getStyle('C6:C7') + ->getBorders() + ->getAllBorders() + ->setBorderStyle(Border::BORDER_THIN) + ->setColor(new Color(Color::COLOR_BLACK)); + + // This is where the error was introduced (!!!) + $worksheet->getColumnDimension('A')->setVisible(false); + $Tcpdf = new Tcpdf($spreadsheet); + $html = $Tcpdf->generateHtmlAll(); + $html = preg_replace('/^\\s+/m', '', $html) ?? $html; + $html = preg_replace('/[\\n\\r]/', '', $html) ?? $html; + self::assertStringContainsString( + '' + . '' + . 'B' + . 'C' + . '', + $html + ); + self::assertStringContainsString( + '' + . '' + . 'Hello World Headline' + . '', + $html + ); + $emptyRowCount = substr_count( + $html, + '' + . '' + . '' + ); + self::assertSame(3, $emptyRowCount); + self::assertStringContainsString( + '' + . '' + . 'Label 1' + . 'Text 1' + . '', + $html + ); + self::assertStringContainsString( + '' + . '' + . 'Label 2' + . 'Text 2' + . '', + $html + ); + $spreadsheet->disconnectWorksheets(); + } +} diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php index ac814b8ce3..9d10cdf10d 100644 --- a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php @@ -7,6 +7,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException; use PhpOffice\PhpSpreadsheet\Writer\Xls\Parser; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; class ParserTest extends TestCase @@ -54,4 +55,48 @@ public function testGoodParse(): void $parser = new Parser($this->spreadsheet); self::assertSame('1e01001e02001e0300', bin2hex($parser->toReversePolish(['left' => 1, 'right' => 2, 'value' => 3]))); } + + #[DataProvider('cellSheetnameQuotedProvider')] + public function testCellSheetnameQuoted(bool $expected, string $address): void + { + self::assertSame($expected, Parser::matchCellSheetnameQuoted($address)); + } + + public static function cellSheetnameQuotedProvider(): array + { + return [ + [true, '\'TS GK Mustermann Hans 2\'!$N$1'], + [true, '\'TS GK Mustermann Hans 2\'!N15'], + [true, '\'TS GK Mus\'\'termann Hans 2\'!N15'], + [false, '\'TS GK Mus\'termann Hans 2\'!N15'], + [false, '\'TS GK Mustermann Hans 2\'!N15:P16'], + [false, '\'TS GK Mustermann Hans 2\'!$N$15:$P$16'], + [false, 'sheet1!N15'], + [false, 'sheet1!N15:P16'], + [false, 'N15'], + [false, 'N15:P16'], + ]; + } + + #[DataProvider('rangeSheetnameQuotedProvider')] + public function testRangeSheetnameQuoted(bool $expected, string $address): void + { + self::assertSame($expected, Parser::matchRangeSheetnameQuoted($address)); + } + + public static function rangeSheetnameQuotedProvider(): array + { + return [ + [false, '\'TS GK Mustermann Hans 2\'!$N$1'], + [false, '\'TS GK Mustermann Hans 2\'!N15'], + [false, '\'TS GK Mus\'\'termann Hans 2\'!N15'], + [false, '\'TS GK Mus\'termann Hans 2\'!N15'], + [true, '\'TS GK Mustermann Hans 2\'!N15:P16'], + [true, '\'TS GK Mustermann Hans 2\'!$N$15:$P$16'], + [false, 'sheet1!N15'], + [false, 'sheet1!N15:P16'], + [false, 'N15'], + [false, 'N15:P16'], + ]; + } } diff --git a/tests/data/Reader/XLSX/excel-groupby-one.xlsx b/tests/data/Reader/XLSX/excel-groupby-one.xlsx new file mode 100644 index 0000000000..dbb92b6057 Binary files /dev/null and b/tests/data/Reader/XLSX/excel-groupby-one.xlsx differ