diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1c01a7bdd7..c7d02f4734 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,6 +11,7 @@ jobs:
- '8.0'
- '8.1'
- '8.2'
+ - '8.3'
include:
- php-version: 'nightly'
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 3eafb6ca19..ba381a28f7 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -5,6 +5,7 @@
samples
src
tests
+ infra
samples/Header.php
*/tests/Core/*/*Test\.(inc|css|js)$
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 240454ef75..76f9746d41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,12 +24,18 @@ and this project adheres to [Semantic Versioning](https://semver.org).
- Support for Conditional Formatting Color Scale. [PR #3738](https://github.com/PHPOffice/PhpSpreadsheet/pull/3738)
- Support Additional Tags in Helper/Html. [Issue #3751](https://github.com/PHPOffice/PhpSpreadsheet/issues/3751) [PR #3752](https://github.com/PHPOffice/PhpSpreadsheet/pull/3752)
- Writer ODS : Write Border Style for cells [Issue #3690](https://github.com/PHPOffice/PhpSpreadsheet/issues/3690) [PR #3693](https://github.com/PHPOffice/PhpSpreadsheet/pull/3693)
+- Sheet Background Images [Issue #1649](https://github.com/PHPOffice/PhpSpreadsheet/issues/1649) [PR #3795](https://github.com/PHPOffice/PhpSpreadsheet/pull/3795)
+- Check if Coordinate is Inside Range [PR #3779](https://github.com/PHPOffice/PhpSpreadsheet/pull/3779)
+- Flipping Images [Issue #731](https://github.com/PHPOffice/PhpSpreadsheet/issues/731) [PR #3801](https://github.com/PHPOffice/PhpSpreadsheet/pull/3801)
+- Chart Dynamic Title and Font Properties [Issue #3797](https://github.com/PHPOffice/PhpSpreadsheet/issues/3797) [PR #3800](https://github.com/PHPOffice/PhpSpreadsheet/pull/3800)
### Changed
- Drop support for PHP 7.4, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support [PR #3713](https://github.com/PHPOffice/PhpSpreadsheet/pull/3713)
- RLM Added to NumberFormatter Currency. This happens depending on release of ICU which Php is using (it does not yet happen with any official release). PhpSpreadsheet will continue to use the value returned by Php, but a method is added to keep the result unchanged from release to release. [Issue #3571](https://github.com/PHPOffice/PhpSpreadsheet/issues/3571) [PR #3640](https://github.com/PHPOffice/PhpSpreadsheet/pull/3640)
- `toFormattedString` will now always return a string. This was introduced with 1.28.0, but was not properly documented at the time. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
+- Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD was changed in 1.28.0, but was not properly documented at the time. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577)
+- Html Writer will attempt to use Chart coordinates to determine image size. [Issue #3783](https://github.com/PHPOffice/PhpSpreadsheet/issues/3783) [PR #3787](https://github.com/PHPOffice/PhpSpreadsheet/pull/3787)
### Deprecated
@@ -67,6 +73,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
- Break Some Circular References. [PR #3716](https://github.com/PHPOffice/PhpSpreadsheet/pull/3716) [PR #3707](https://github.com/PHPOffice/PhpSpreadsheet/pull/3707)
- Missing Font Index in Some Xls. [PR #3734](https://github.com/PHPOffice/PhpSpreadsheet/pull/3734)
- Load Tables even with READ_DATA_ONLY. [PR #3726](https://github.com/PHPOffice/PhpSpreadsheet/pull/3726)
+- Theme File Missing but Referenced in Spreadsheet. [Issue #3770](https://github.com/PHPOffice/PhpSpreadsheet/issues/3770) [PR #3772](https://github.com/PHPOffice/PhpSpreadsheet/pull/3772)
+- Slk Shared Formulas. [Issue #2267](https://github.com/PHPOffice/PhpSpreadsheet/issues/2267) [PR #3776](https://github.com/PHPOffice/PhpSpreadsheet/pull/3776)
+- Html omitting some charts. [Issue #3767](https://github.com/PHPOffice/PhpSpreadsheet/issues/3767) [PR #3771](https://github.com/PHPOffice/PhpSpreadsheet/pull/3771)
+- Case Insensitive Comparison for Sheet Names [PR #3791](https://github.com/PHPOffice/PhpSpreadsheet/pull/3791)
+- Performance improvement for Xlsx Reader. [Issue #3683](https://github.com/PHPOffice/PhpSpreadsheet/issues/3683) [PR #3810](https://github.com/PHPOffice/PhpSpreadsheet/pull/3810)
+- Prevent loop in Shared/File. [Issue #3807](https://github.com/PHPOffice/PhpSpreadsheet/issues/3807) [PR #3809](https://github.com/PHPOffice/PhpSpreadsheet/pull/3809)
## 1.29.0 - 2023-06-15
@@ -146,10 +158,11 @@ and this project adheres to [Semantic Versioning](https://semver.org).
- Improved support for locale settings and currency codes when matching formatted strings to numerics in the Calculation Engine [PR #3373](https://github.com/PHPOffice/PhpSpreadsheet/pull/3373) and [PR #3374](https://github.com/PHPOffice/PhpSpreadsheet/pull/3374)
- Improved support for locale settings and matching in the Advanced Value Binder [PR #3376](https://github.com/PHPOffice/PhpSpreadsheet/pull/3376)
- `toFormattedString` will now always return a string. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
+- Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD is changed. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577) [PR #3377](https://github.com/PHPOffice/PhpSpreadsheet/pull/3377)
### Deprecated
-- Rationalisation of Pre-defined Currency Format Masks
+- Rationalisation of Pre-defined Currency Format Masks [PR #3377](https://github.com/PHPOffice/PhpSpreadsheet/pull/3377)
### Removed
diff --git a/composer.lock b/composer.lock
index 562eaac4ea..1560eafc97 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1136,16 +1136,16 @@
"packages-dev": [
{
"name": "composer/pcre",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+ "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+ "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
"shasum": ""
},
"require": {
@@ -1187,7 +1187,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.0"
+ "source": "https://github.com/composer/pcre/tree/3.1.1"
},
"funding": [
{
@@ -1203,7 +1203,7 @@
"type": "tidelift"
}
],
- "time": "2022-11-17T09:50:14+00:00"
+ "time": "2023-10-11T07:11:09+00:00"
},
{
"name": "composer/semver",
@@ -1358,12 +1358,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/composer-installer.git",
- "reference": "b49fdb59dd34284bd347435a959f2093894d1ac8"
+ "reference": "eda4086d152f545894f94018cb208f38dc251172"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/b49fdb59dd34284bd347435a959f2093894d1ac8",
- "reference": "b49fdb59dd34284bd347435a959f2093894d1ac8",
+ "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/eda4086d152f545894f94018cb208f38dc251172",
+ "reference": "eda4086d152f545894f94018cb208f38dc251172",
"shasum": ""
},
"require": {
@@ -1428,7 +1428,7 @@
"issues": "https://github.com/PHPCSStandards/composer-installer/issues",
"source": "https://github.com/PHPCSStandards/composer-installer"
},
- "time": "2023-09-22T07:48:18+00:00"
+ "time": "2023-11-26T02:51:26+00:00"
},
{
"name": "doctrine/instantiator",
@@ -1564,55 +1564,50 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.34.0",
+ "version": "v3.40.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "7c7a4ad2ed8fe50df3e25528218b13d383608f23"
+ "reference": "27d2b3265b5d550ec411b4319967ae7cfddfb2e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7c7a4ad2ed8fe50df3e25528218b13d383608f23",
- "reference": "7c7a4ad2ed8fe50df3e25528218b13d383608f23",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/27d2b3265b5d550ec411b4319967ae7cfddfb2e0",
+ "reference": "27d2b3265b5d550ec411b4319967ae7cfddfb2e0",
"shasum": ""
},
"require": {
- "composer/semver": "^3.3",
+ "composer/semver": "^3.4",
"composer/xdebug-handler": "^3.0.3",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^7.4 || ^8.0",
"sebastian/diff": "^4.0 || ^5.0",
- "symfony/console": "^5.4 || ^6.0",
- "symfony/event-dispatcher": "^5.4 || ^6.0",
- "symfony/filesystem": "^5.4 || ^6.0",
- "symfony/finder": "^5.4 || ^6.0",
- "symfony/options-resolver": "^5.4 || ^6.0",
- "symfony/polyfill-mbstring": "^1.27",
- "symfony/polyfill-php80": "^1.27",
- "symfony/polyfill-php81": "^1.27",
- "symfony/process": "^5.4 || ^6.0",
- "symfony/stopwatch": "^5.4 || ^6.0"
- },
- "conflict": {
- "stevebauman/unfinalize": "*"
+ "symfony/console": "^5.4 || ^6.0 || ^7.0",
+ "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+ "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+ "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+ "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+ "symfony/polyfill-mbstring": "^1.28",
+ "symfony/polyfill-php80": "^1.28",
+ "symfony/polyfill-php81": "^1.28",
+ "symfony/process": "^5.4 || ^6.0 || ^7.0",
+ "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"facile-it/paraunit": "^1.3 || ^2.0",
"justinrainbow/json-schema": "^5.2",
- "keradus/cli-executor": "^2.0",
+ "keradus/cli-executor": "^2.1",
"mikey179/vfsstream": "^1.6.11",
- "php-coveralls/php-coveralls": "^2.5.3",
+ "php-coveralls/php-coveralls": "^2.7",
"php-cs-fixer/accessible-object": "^1.1",
- "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
- "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
- "phpspec/prophecy": "^1.16",
+ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
+ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
+ "phpspec/prophecy": "^1.17",
"phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.5",
- "phpunitgoodpractices/polyfill": "^1.6",
- "phpunitgoodpractices/traits": "^1.9.2",
- "symfony/phpunit-bridge": "^6.2.3",
- "symfony/yaml": "^5.4 || ^6.0"
+ "phpunit/phpunit": "^9.6",
+ "symfony/phpunit-bridge": "^6.3.8 || ^7.0",
+ "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -1650,7 +1645,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.34.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.40.0"
},
"funding": [
{
@@ -1658,7 +1653,7 @@
"type": "github"
}
],
- "time": "2023-09-29T15:34:26+00:00"
+ "time": "2023-11-26T09:25:53+00:00"
},
{
"name": "masterminds/html5",
@@ -1775,16 +1770,16 @@
},
{
"name": "mpdf/mpdf",
- "version": "v8.2.0",
+ "version": "v8.2.2",
"source": {
"type": "git",
"url": "https://github.com/mpdf/mpdf.git",
- "reference": "170a236a588d177c2aa7447ce490a030ca68e6f4"
+ "reference": "596a87b876d7793be7be060a8ac13424de120dd5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mpdf/mpdf/zipball/170a236a588d177c2aa7447ce490a030ca68e6f4",
- "reference": "170a236a588d177c2aa7447ce490a030ca68e6f4",
+ "url": "https://api.github.com/repos/mpdf/mpdf/zipball/596a87b876d7793be7be060a8ac13424de120dd5",
+ "reference": "596a87b876d7793be7be060a8ac13424de120dd5",
"shasum": ""
},
"require": {
@@ -1794,7 +1789,7 @@
"mpdf/psr-log-aware-trait": "^2.0 || ^3.0",
"myclabs/deep-copy": "^1.7",
"paragonie/random_compat": "^1.4|^2.0|^9.99.99",
- "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+ "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"psr/http-message": "^1.0 || ^2.0",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"setasign/fpdi": "^2.1"
@@ -1852,7 +1847,7 @@
"type": "custom"
}
],
- "time": "2023-09-01T11:44:52+00:00"
+ "time": "2023-11-07T13:52:14+00:00"
},
{
"name": "mpdf/psr-http-message-shim",
@@ -2376,16 +2371,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.36",
+ "version": "1.10.46",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "ffa3089511121a672e62969404e4fddc753f9b15"
+ "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa3089511121a672e62969404e4fddc753f9b15",
- "reference": "ffa3089511121a672e62969404e4fddc753f9b15",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/90d3d25c5b98b8068916bbf08ce42d5cb6c54e70",
+ "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70",
"shasum": ""
},
"require": {
@@ -2434,20 +2429,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-29T14:07:45+00:00"
+ "time": "2023-11-28T14:57:26+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.14",
+ "version": "1.3.15",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "614acc10c522e319639bf38b0698a4a566665f04"
+ "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/614acc10c522e319639bf38b0698a4a566665f04",
- "reference": "614acc10c522e319639bf38b0698a4a566665f04",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
+ "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
"shasum": ""
},
"require": {
@@ -2484,9 +2479,9 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.14"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15"
},
- "time": "2023-08-25T09:46:39+00:00"
+ "time": "2023-10-09T18:58:39+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -2809,16 +2804,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.13",
+ "version": "9.6.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be"
+ "reference": "43653e6ad7adc22e7b667dd561bf8fcb74c10cf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be",
- "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43653e6ad7adc22e7b667dd561bf8fcb74c10cf0",
+ "reference": "43653e6ad7adc22e7b667dd561bf8fcb74c10cf0",
"shasum": ""
},
"require": {
@@ -2892,7 +2887,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.14"
},
"funding": [
{
@@ -2908,7 +2903,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-19T05:39:22+00:00"
+ "time": "2023-12-01T06:10:48+00:00"
},
{
"name": "psr/container",
@@ -5332,16 +5327,16 @@
},
{
"name": "theseer/tokenizer",
- "version": "1.2.1",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+ "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
- "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+ "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
"shasum": ""
},
"require": {
@@ -5370,7 +5365,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
},
"funding": [
{
@@ -5378,7 +5373,7 @@
"type": "github"
}
],
- "time": "2021-07-28T10:34:58+00:00"
+ "time": "2023-11-20T00:12:19+00:00"
}
],
"aliases": [],
@@ -5408,5 +5403,5 @@
"platform-overrides": {
"php": "8.0.99"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/infra/DocumentGenerator.php b/infra/DocumentGenerator.php
index e2c3c86cb9..5a86d17784 100644
--- a/infra/DocumentGenerator.php
+++ b/infra/DocumentGenerator.php
@@ -52,7 +52,7 @@ private static function tableRow(array $lengths, ?array $values = null): string
return rtrim($result, ' ');
}
- private static function getPhpSpreadsheetFunctionText($functionCall): string
+ private static function getPhpSpreadsheetFunctionText(mixed $functionCall): string
{
if (is_string($functionCall)) {
return $functionCall;
diff --git a/infra/LocaleGenerator.php b/infra/LocaleGenerator.php
index 5e570f7f0f..508a6480e3 100644
--- a/infra/LocaleGenerator.php
+++ b/infra/LocaleGenerator.php
@@ -38,32 +38,32 @@ class LocaleGenerator
*/
protected $translationBaseFolder;
- protected $phpSpreadsheetFunctions;
+ protected array $phpSpreadsheetFunctions;
/**
* @var Spreadsheet
*/
protected $translationSpreadsheet;
- protected $verbose;
+ protected bool $verbose;
/**
* @var Worksheet
*/
protected $localeTranslations;
- protected $localeLanguageMap = [];
+ protected array $localeLanguageMap = [];
- protected $errorCodeMap = [];
+ protected array $errorCodeMap = [];
/**
* @var Worksheet
*/
private $functionNameTranslations;
- protected $functionNameLanguageMap = [];
+ protected array $functionNameLanguageMap = [];
- protected $functionNameMap = [];
+ protected array $functionNameMap = [];
public function __construct(
string $translationBaseFolder,
@@ -98,7 +98,7 @@ public function generateLocales(): void
}
}
- protected function buildConfigFileForLocale($column, $locale): void
+ protected function buildConfigFileForLocale(string $column, string $locale): void
{
$language = $this->localeTranslations->getCell($column . self::ENGLISH_LANGUAGE_NAME_ROW)->getValue();
$localeLanguage = $this->localeTranslations->getCell($column . self::LOCALE_LANGUAGE_NAME_ROW)->getValue();
@@ -124,7 +124,8 @@ protected function buildConfigFileForLocale($column, $locale): void
fclose($configFile);
}
- protected function writeConfigArgumentSeparator($configFile, $column): void
+ /** @param resource $configFile resource to write to */
+ protected function writeConfigArgumentSeparator($configFile, string $column): void
{
$translationCell = $this->localeTranslations->getCell($column . self::ARGUMENT_SEPARATOR_ROW);
$localeValue = $translationCell->getValue();
@@ -136,7 +137,8 @@ protected function writeConfigArgumentSeparator($configFile, $column): void
}
}
- protected function writeConfigCurrencySymbol($configFile, $column): void
+ /** @param resource $configFile resource to write to */
+ protected function writeConfigCurrencySymbol($configFile, string $column): void
{
$translationCell = $this->localeTranslations->getCell($column . self::CURRENCY_SYMBOL_ROW);
$localeValue = $translationCell->getValue();
@@ -151,7 +153,7 @@ protected function writeConfigCurrencySymbol($configFile, $column): void
}
}
- protected function buildFunctionsFileForLocale($column, $locale): void
+ protected function buildFunctionsFileForLocale(string $column, string $locale): void
{
$language = $this->functionNameTranslations->getCell($column . self::ENGLISH_LANGUAGE_NAME_ROW)->getValue();
$localeLanguage = $this->functionNameTranslations->getCell($column . self::LOCALE_LANGUAGE_NAME_ROW)
@@ -176,6 +178,7 @@ protected function buildFunctionsFileForLocale($column, $locale): void
fclose($functionFile);
}
+ /** @return resource used by other methods in this class */
protected function openConfigFile(string $locale, string $language, string $localeLanguage)
{
$this->log("Building locale {$locale} ($language) configuration");
@@ -185,11 +188,15 @@ protected function openConfigFile(string $locale, string $language, string $loca
$this->log("Writing locale configuration to {$configFileName}");
$configFile = fopen($configFileName, 'wb');
+ if ($configFile === false) {
+ throw new Exception('Unable to open $configFileName for write');
+ }
$this->writeFileHeader($configFile, $localeLanguage, $language, 'locale settings');
return $configFile;
}
+ /** @return resource used by other methods in this class */
protected function openFunctionNameFile(string $locale, string $language, string $localeLanguage)
{
$this->log("Building locale {$locale} ($language) function names");
@@ -199,6 +206,9 @@ protected function openFunctionNameFile(string $locale, string $language, string
$this->log("Writing local function names to {$functionFileName}");
$functionFile = fopen($functionFileName, 'wb');
+ if ($functionFile === false) {
+ throw new Exception('Unable to open $functionFileName for write');
+ }
$this->writeFileHeader($functionFile, $localeLanguage, $language, 'function name translations');
return $functionFile;
@@ -218,6 +228,7 @@ protected function getLocaleFolder(string $locale): string
return $localeFolder;
}
+ /** @param resource $localeFile file being written to */
protected function writeFileHeader($localeFile, string $localeLanguage, string $language, string $title): void
{
fwrite($localeFile, str_repeat('#', 60) . self::EOL);
@@ -229,6 +240,7 @@ protected function writeFileHeader($localeFile, string $localeLanguage, string $
fwrite($localeFile, str_repeat('#', 60) . self::EOL . self::EOL);
}
+ /** @param resource $localeFile file being written to */
protected function writeFileSectionHeader($localeFile, string $header): void
{
fwrite($localeFile, self::EOL . '##' . self::EOL);
@@ -245,9 +257,6 @@ protected function openTranslationWorkbook(): void
protected function getTranslationSheet(string $sheetName): Worksheet
{
$worksheet = $this->translationSpreadsheet->setActiveSheetIndexByName($sheetName);
- if ($worksheet === null) {
- throw new Exception("{$sheetName} Worksheet not found");
- }
return $worksheet;
}
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c7cbf42ca9..c9762340b2 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,31 +1,6 @@
parameters:
ignoreErrors:
- -
- message: "#^Cannot call method getTokenSubType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
- count: 4
- path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
- -
- message: "#^Cannot call method getTokenType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
- count: 8
- path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-
message: "#^Binary operation \"/\" between float and array\\|float\\|int\\|string results in an error\\.$#"
count: 1
path: src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
-
- -
- message: "#^Offset 2 does not exist on array\\{int, int, int, int\\}\\|array\\{int, int\\}\\.$#"
- count: 1
- path: src/PhpSpreadsheet/Worksheet/Validations.php
-
- -
- message: "#^Offset 3 does not exist on array\\{int, int, int, int\\}\\|array\\{int, int\\}\\.$#"
- count: 1
- path: src/PhpSpreadsheet/Worksheet/Validations.php
-
- -
- message: "#^Parameter \\#2 \\$value of function ini_set expects string, int given\\.$#"
- count: 1
- path: tests/bootstrap.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index f6ce123adc..154541708c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -8,6 +8,8 @@ parameters:
paths:
- src/
- tests/
+ - samples/
+ - infra/
excludePaths:
- src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
- src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -21,3 +23,4 @@ parameters:
ignoreErrors:
# Accept a bit anything for assert methods
- '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
+ - '~^Variable \$helper might not be defined\.$~'
diff --git a/samples/Autofilter/10_Autofilter_selection_2.php b/samples/Autofilter/10_Autofilter_selection_2.php
index 4d5d891cff..6b82bcdf52 100644
--- a/samples/Autofilter/10_Autofilter_selection_2.php
+++ b/samples/Autofilter/10_Autofilter_selection_2.php
@@ -126,7 +126,7 @@
$autoFilter->getColumn('D')
->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER)
->createRule()
- ->setRule(Rule::AUTOFILTER_COLUMN_RULE_EQUAL, null, Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE)
+ ->setRule(Rule::AUTOFILTER_COLUMN_RULE_EQUAL, '', Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE)
->setRuleType(Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
$helper->log('Add filter on the Date (Column D) to display year to date');
diff --git a/samples/Basic/02_Types.php b/samples/Basic/02_Types.php
index 4eaaa8b15f..d28af579d2 100644
--- a/samples/Basic/02_Types.php
+++ b/samples/Basic/02_Types.php
@@ -109,9 +109,9 @@
$richText->createText('你好 ');
$payable = $richText->createTextRun('你 好 吗？');
-$payable->getFont()->setBold(true);
-$payable->getFont()->setItalic(true);
-$payable->getFont()->setColor(new Color(Color::COLOR_DARKGREEN));
+$payable->getFontOrThrow()->setBold(true);
+$payable->getFontOrThrow()->setItalic(true);
+$payable->getFontOrThrow()->setColor(new Color(Color::COLOR_DARKGREEN));
$richText->createText(', unless specified otherwise on the invoice.');
@@ -123,7 +123,7 @@
$richText2->createText("black text\n");
$red = $richText2->createTextRun('red text');
-$red->getFont()->setColor(new Color(Color::COLOR_RED));
+$red->getFontOrThrow()->setColor(new Color(Color::COLOR_RED));
$spreadsheet->getActiveSheet()
->getCell('C14')
diff --git a/samples/Basic/19_Namedrange.php b/samples/Basic/19_Namedrange.php
index 6170fa28e7..5b1a252708 100644
--- a/samples/Basic/19_Namedrange.php
+++ b/samples/Basic/19_Namedrange.php
@@ -36,6 +36,9 @@
// Rename named ranges
$helper->log('Rename named ranges');
+if ($spreadsheet->getNamedRange('PersonName') === null) {
+ throw new Exception('named range not found');
+}
$spreadsheet->getNamedRange('PersonName')->setName('PersonFN');
// Rename worksheet
diff --git a/samples/Basic/25_In_memory_image.php b/samples/Basic/25_In_memory_image.php
index c80a4981ec..ebb73c2ed5 100644
--- a/samples/Basic/25_In_memory_image.php
+++ b/samples/Basic/25_In_memory_image.php
@@ -28,12 +28,15 @@
// Generate an image
$helper->log('Generate an image');
MemoryDrawing::checkGd();
-$gdImage = @imagecreatetruecolor(120, 20);
+$gdImage = imagecreatetruecolor(120, 20);
if (!$gdImage) {
- exit('Cannot Initialize new GD image stream');
+ throw new Exception('Cannot Initialize new GD image stream');
}
$textColor = imagecolorallocate($gdImage, 255, 255, 255);
+if ($textColor === false) {
+ throw new Exception('imagecolorallocate failed');
+}
imagestring($gdImage, 1, 5, 5, 'Created with PhpSpreadsheet', $textColor);
// Add a drawing to the worksheet
diff --git a/samples/Basic/39_Dropdown.php b/samples/Basic/39_Dropdown.php
index 0e8ff52b6e..232ed0eda9 100644
--- a/samples/Basic/39_Dropdown.php
+++ b/samples/Basic/39_Dropdown.php
@@ -20,7 +20,8 @@
->setDescription('Test document for PhpSpreadsheet, generated using PHP classes.')
->setKeywords('Office PhpSpreadsheet php')
->setCategory('Test result file');
-function transpose($value)
+
+function transpose(string $value): array
{
return [$value];
}
@@ -30,12 +31,12 @@ function transpose($value)
$column = 'F';
// Set data for dropdowns
-$continents = glob(__DIR__ . '/data/continents/*');
+$continents = glob(__DIR__ . '/data/continents/*') ?: [];
foreach ($continents as $key => $filename) {
$continent = pathinfo($filename, PATHINFO_FILENAME);
$helper->log("Loading $continent");
$continent = str_replace(' ', '_', $continent);
- $countries = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ $countries = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
$countryCount = count($countries);
// Transpose $countries from a row to a column array
diff --git a/samples/Calculations/Engineering/Convert-Online.php b/samples/Calculations/Engineering/Convert-Online.php
index e20e4c79b6..3d26a3f6ba 100644
--- a/samples/Calculations/Engineering/Convert-Online.php
+++ b/samples/Calculations/Engineering/Convert-Online.php
@@ -77,6 +77,7 @@
$quantity = $_POST['quantity'];
$fromUnit = $_POST['fromUnit'];
$toUnit = $_POST['toUnit'];
+ /** @var float|string */
$result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
echo "{$quantity} {$units[$_POST['category']][$fromUnit]} is {$result} {$units[$_POST['category']][$toUnit]}", PHP_EOL;
diff --git a/samples/Chart/32_Chart_read_write.php b/samples/Chart/32_Chart_read_write.php
index a1f2f54681..900c9567c2 100644
--- a/samples/Chart/32_Chart_read_write.php
+++ b/samples/Chart/32_Chart_read_write.php
@@ -13,7 +13,7 @@
$inputFileNames[] = __DIR__ . '/../templates/' . $argv[$i];
}
} else {
- $inputFileNames = glob($inputFileNames);
+ $inputFileNames = glob($inputFileNames) ?: [];
}
foreach ($inputFileNames as $inputFileName) {
$inputFileNameShort = basename($inputFileName);
@@ -40,23 +40,23 @@
} else {
natsort($chartNames);
foreach ($chartNames as $i => $chartName) {
- $chart = $worksheet->getChartByName($chartName);
+ $chart = $worksheet->getChartByNameOrThrow($chartName);
if ($chart->getTitle() !== null) {
- $caption = '"' . implode(' ', $chart->getTitle()->getCaption()) . '"';
+ $caption = '"' . $chart->getTitle()->getCaptionText($spreadsheet) . '"';
} else {
$caption = 'Untitled';
}
$helper->log(' ' . $chartName . ' - ' . $caption);
$indentation = str_repeat(' ', strlen($chartName) + 3);
- $groupCount = $chart->getPlotArea()->getPlotGroupCount();
+ $groupCount = $chart->getPlotAreaOrThrow()->getPlotGroupCount();
if ($groupCount == 1) {
- $chartType = $chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+ $chartType = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex(0)->getPlotType();
$helper->log($indentation . ' ' . $chartType);
$helper->renderChart($chart, __FILE__);
} else {
$chartTypes = [];
for ($i = 0; $i < $groupCount; ++$i) {
- $chartTypes[] = $chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+ $chartTypes[] = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex($i)->getPlotType();
}
$chartTypes = array_unique($chartTypes);
if (count($chartTypes) == 1) {
diff --git a/samples/Chart/32_Chart_read_write_HTML.php b/samples/Chart/32_Chart_read_write_HTML.php
index 3cb377873c..0dc5484ce5 100644
--- a/samples/Chart/32_Chart_read_write_HTML.php
+++ b/samples/Chart/32_Chart_read_write_HTML.php
@@ -18,7 +18,7 @@
$inputFileNames[] = __DIR__ . '/../templates/' . $argv[$i];
}
} else {
- $inputFileNames = glob($inputFileNames);
+ $inputFileNames = glob($inputFileNames) ?: [];
}
foreach ($inputFileNames as $inputFileName) {
$inputFileNameShort = basename($inputFileName);
@@ -46,22 +46,22 @@
} else {
natsort($chartNames);
foreach ($chartNames as $i => $chartName) {
- $chart = $worksheet->getChartByName($chartName);
+ $chart = $worksheet->getChartByNameOrThrow($chartName);
if ($chart->getTitle() !== null) {
- $caption = '"' . implode(' ', $chart->getTitle()->getCaption()) . '"';
+ $caption = '"' . $chart->getTitle()->getCaptionText($spreadsheet) . '"';
} else {
$caption = 'Untitled';
}
$helper->log(' ' . $chartName . ' - ' . $caption);
$helper->log(str_repeat(' ', strlen($chartName) + 3));
- $groupCount = $chart->getPlotArea()->getPlotGroupCount();
+ $groupCount = $chart->getPlotAreaOrThrow()->getPlotGroupCount();
if ($groupCount == 1) {
- $chartType = $chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+ $chartType = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex(0)->getPlotType();
$helper->log(' ' . $chartType);
} else {
$chartTypes = [];
for ($i = 0; $i < $groupCount; ++$i) {
- $chartTypes[] = $chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+ $chartTypes[] = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex($i)->getPlotType();
}
$chartTypes = array_unique($chartTypes);
if (count($chartTypes) == 1) {
diff --git a/samples/Chart/32_Chart_read_write_PDF.php b/samples/Chart/32_Chart_read_write_PDF.php
index e3d702a9df..0ac41f71f6 100644
--- a/samples/Chart/32_Chart_read_write_PDF.php
+++ b/samples/Chart/32_Chart_read_write_PDF.php
@@ -20,7 +20,7 @@
$inputFileNames[] = __DIR__ . '/../templates/' . $argv[$i];
}
} else {
- $inputFileNames = glob($inputFileNames);
+ $inputFileNames = glob($inputFileNames) ?: [];
}
foreach ($inputFileNames as $inputFileName) {
$inputFileNameShort = basename($inputFileName);
@@ -48,22 +48,22 @@
} else {
natsort($chartNames);
foreach ($chartNames as $i => $chartName) {
- $chart = $worksheet->getChartByName($chartName);
+ $chart = $worksheet->getChartByNameOrThrow($chartName);
if ($chart->getTitle() !== null) {
- $caption = '"' . implode(' ', $chart->getTitle()->getCaption()) . '"';
+ $caption = '"' . $chart->getTitle()->getCaptionText($spreadsheet) . '"';
} else {
$caption = 'Untitled';
}
$helper->log(' ' . $chartName . ' - ' . $caption);
$helper->log(str_repeat(' ', strlen($chartName) + 3));
- $groupCount = $chart->getPlotArea()->getPlotGroupCount();
+ $groupCount = $chart->getPlotAreaOrThrow()->getPlotGroupCount();
if ($groupCount == 1) {
- $chartType = $chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+ $chartType = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex(0)->getPlotType();
$helper->log(' ' . $chartType);
} else {
$chartTypes = [];
for ($i = 0; $i < $groupCount; ++$i) {
- $chartTypes[] = $chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+ $chartTypes[] = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex($i)->getPlotType();
}
$chartTypes = array_unique($chartTypes);
if (count($chartTypes) == 1) {
diff --git a/samples/Chart/33_Chart_create_line_dateaxis.php b/samples/Chart/33_Chart_create_line_dateaxis.php
index e5296d1de5..c177de79a3 100644
--- a/samples/Chart/33_Chart_create_line_dateaxis.php
+++ b/samples/Chart/33_Chart_create_line_dateaxis.php
@@ -195,7 +195,7 @@
$chartSheet = $spreadsheet->getSheet(1);
$chartSheet->setTitle('Scatter+Line Chart');
-$chartSheet = $spreadsheet->getSheetByName('Scatter+Line Chart');
+$chartSheet = $spreadsheet->getSheetByNameOrThrow('Scatter+Line Chart');
// Add the chart to the worksheet
$chartSheet->addChart($chart);
@@ -340,11 +340,14 @@
function dateRange(int $nrows, Spreadsheet $wrkbk): array
{
- $dataSheet = $wrkbk->getSheetByName('Data');
+ $dataSheet = $wrkbk->getSheetByNameOrThrow('Data');
// start the xaxis at the beginning of the quarter of the first date
$startDateStr = $dataSheet->getCell('B2')->getValue(); // yyyy-mm-dd date string
$startDate = DateTime::createFromFormat('Y-m-d', $startDateStr); // php date obj
+ if ($startDate === false) {
+ throw new Exception("invalid start date $startDateStr on spreadsheet");
+ }
// get date of first day of the quarter of the start date
$startMonth = (int) $startDate->format('n'); // suppress leading zero
@@ -357,12 +360,19 @@ function dateRange(int $nrows, Spreadsheet $wrkbk): array
// end the xaxis at the end of the quarter of the last date
$lastDateStr = $dataSheet->getCell([2, $nrows + 1])->getValue();
$lastDate = DateTime::createFromFormat('Y-m-d', $lastDateStr);
+ if ($lastDate === false) {
+ throw new Exception("invalid last date $lastDateStr on spreadsheet");
+ }
$lastMonth = (int) $lastDate->format('n');
$lastYr = (int) $lastDate->format('Y');
$qtr = intdiv($lastMonth, 3) + (($lastMonth % 3 > 0) ? 1 : 0);
$qtrEndMonth = 3 + (($qtr - 1) * 3);
- $lastDOM = cal_days_in_month(CAL_GREGORIAN, $qtrEndMonth, $lastYr);
$qtrEndMonth = sprintf('%02d', $qtrEndMonth);
+ $lastDOMDate = DateTime::createFromFormat('Y-m-d', "$lastYr-$qtrEndMonth-01");
+ if ($lastDOMDate === false) {
+ throw new Exception("invalid last dom date $lastYr-$qtrEndMonth-01 on spreadsheet");
+ }
+ $lastDOM = $lastDOMDate->format('t');
$qtrEndStr = "$lastYr-$qtrEndMonth-$lastDOM";
$ExcelQtrEndDateVal = SharedDate::convertIsoDate($qtrEndStr);
diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart/33_Chart_create_scatter5_trendlines.php
index f58aadaf73..7467c82069 100644
--- a/samples/Chart/33_Chart_create_scatter5_trendlines.php
+++ b/samples/Chart/33_Chart_create_scatter5_trendlines.php
@@ -169,7 +169,7 @@
$chartSheet = $spreadsheet->getSheet(1);
$chartSheet->setTitle('Scatter Chart');
-$chartSheet = $spreadsheet->getSheetByName('Scatter Chart');
+$chartSheet = $spreadsheet->getSheetByNameOrThrow('Scatter Chart');
// Add the chart to the worksheet
$chartSheet->addChart($chart);
diff --git a/samples/Chart/35_Chart_render.php b/samples/Chart/35_Chart_render.php
index 4c403d993b..57eb691ef8 100644
--- a/samples/Chart/35_Chart_render.php
+++ b/samples/Chart/35_Chart_render.php
@@ -19,11 +19,13 @@
$inputFileNames[] = __DIR__ . '/../templates/' . $argv[$i];
}
} else {
- $inputFileNames = glob($inputFileNames);
+ $inputFileNames = glob($inputFileNames) ?: [];
}
if (count($inputFileNames) === 1) {
+ /** @var string[] */
$unresolvedErrors = [];
} else {
+ /** @var string[] */
$unresolvedErrors = [
// The following spreadsheet was created by 3rd party software,
// and doesn't include the data that usually accompanies a chart.
@@ -66,9 +68,9 @@
natsort($chartNames);
foreach ($chartNames as $j => $chartName) {
$i = $renderedCharts + $j;
- $chart = $worksheet->getChartByName($chartName);
+ $chart = $worksheet->getChartByNameOrThrow($chartName);
if ($chart->getTitle() !== null) {
- $caption = '"' . implode(' ', $chart->getTitle()->getCaption()) . '"';
+ $caption = '"' . $chart->getTitle()->getCaptionText($spreadsheet) . '"';
} else {
$caption = 'Untitled';
}
diff --git a/samples/Chart/35_Chart_render33.php b/samples/Chart/35_Chart_render33.php
index 97091fceec..f9c7c11ad6 100644
--- a/samples/Chart/35_Chart_render33.php
+++ b/samples/Chart/35_Chart_render33.php
@@ -10,7 +10,7 @@
Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
$inputFileType = 'Xlsx';
-$inputFileNames = $helper->getTemporaryFolder() . '/33_Chart_create_*.xlsx';
+$inputFileNamesString = $helper->getTemporaryFolder() . '/33_Chart_create_*.xlsx';
if ((isset($argc)) && ($argc > 1)) {
$inputFileNames = [];
@@ -18,11 +18,13 @@
$inputFileNames[] = __DIR__ . '/../templates/' . $argv[$i];
}
} else {
- $inputFileNames = glob($inputFileNames);
+ $inputFileNames = glob($inputFileNamesString) ?: [];
}
if (count($inputFileNames) === 1) {
+ /** @var string[] */
$unresolvedErrors = [];
} else {
+ /** @var string[] */
$unresolvedErrors = [
//'33_Chart_create_bar_stacked.xlsx', // fixed with mitoteam/jpgraph 10.3
];
@@ -62,9 +64,9 @@
natsort($chartNames);
foreach ($chartNames as $j => $chartName) {
$i = $renderedCharts + $j;
- $chart = $worksheet->getChartByName($chartName);
+ $chart = $worksheet->getChartByNameOrThrow($chartName);
if ($chart->getTitle() !== null) {
- $caption = '"' . implode(' ', $chart->getTitle()->getCaption()) . '"';
+ $caption = '"' . $chart->getTitle()->getCaptionText($spreadsheet) . '"';
} else {
$caption = 'Untitled';
}
diff --git a/samples/Chart/37_Chart_dynamic_title.php b/samples/Chart/37_Chart_dynamic_title.php
new file mode 100644
index 0000000000..e0df17cd04
--- /dev/null
+++ b/samples/Chart/37_Chart_dynamic_title.php
@@ -0,0 +1,83 @@
+log('File ' . $inputFileNameShort . ' does not exist');
+
+ continue;
+ }
+ $reader = IOFactory::createReader($inputFileType);
+ $reader->setIncludeCharts(true);
+ $callStartTime = microtime(true);
+ $spreadsheet = $reader->load($inputFileName);
+ $helper->logRead($inputFileType, $inputFileName, $callStartTime);
+
+ $helper->log('Iterate worksheets looking at the charts');
+ foreach ($spreadsheet->getWorksheetIterator() as $worksheet) {
+ $sheetName = $worksheet->getTitle();
+ $worksheet->getCell('A1')->setValue('Changed Title');
+ $helper->log('Worksheet: ' . $sheetName);
+
+ $chartNames = $worksheet->getChartNames();
+ if (empty($chartNames)) {
+ $helper->log(' There are no charts in this worksheet');
+ } else {
+ natsort($chartNames);
+ foreach ($chartNames as $i => $chartName) {
+ $chart = $worksheet->getChartByNameOrThrow($chartName);
+ if ($chart->getTitle() !== null) {
+ $caption = '"' . $chart->getTitle()->getCaptionText($spreadsheet) . '"';
+ } else {
+ $caption = 'Untitled';
+ }
+ $helper->log(' ' . $chartName . ' - ' . $caption);
+ $indentation = str_repeat(' ', strlen($chartName) + 3);
+ $groupCount = $chart->getPlotAreaOrThrow()->getPlotGroupCount();
+ if ($groupCount == 1) {
+ $chartType = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex(0)->getPlotType();
+ $helper->log($indentation . ' ' . $chartType);
+ $helper->renderChart($chart, __FILE__, $spreadsheet);
+ } else {
+ $chartTypes = [];
+ for ($i = 0; $i < $groupCount; ++$i) {
+ $chartTypes[] = $chart->getPlotAreaOrThrow()->getPlotGroupByIndex($i)->getPlotType();
+ }
+ $chartTypes = array_unique($chartTypes);
+ if (count($chartTypes) == 1) {
+ $chartType = 'Multiple Plot ' . array_pop($chartTypes);
+ $helper->log($indentation . ' ' . $chartType);
+ $helper->renderChart($chart, __FILE__);
+ } elseif (count($chartTypes) == 0) {
+ $helper->log($indentation . ' *** Type not yet implemented');
+ } else {
+ $helper->log($indentation . ' Combination Chart');
+ $helper->renderChart($chart, __FILE__);
+ }
+ }
+ }
+ }
+ }
+
+ $callStartTime = microtime(true);
+ $helper->write($spreadsheet, $inputFileName, ['Xlsx'], true);
+
+ Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+ $callStartTime = microtime(true);
+ $helper->write($spreadsheet, $inputFileName, ['Html'], true);
+
+ $spreadsheet->disconnectWorksheets();
+ unset($spreadsheet);
+}
diff --git a/samples/DefinedNames/CrossWorksheetNamedFormula.php b/samples/DefinedNames/CrossWorksheetNamedFormula.php
index 5ce7651628..6c2faec2b9 100644
--- a/samples/DefinedNames/CrossWorksheetNamedFormula.php
+++ b/samples/DefinedNames/CrossWorksheetNamedFormula.php
@@ -40,7 +40,7 @@
$worksheet = $spreadsheet->addSheet(new Worksheet($spreadsheet));
setYearlyData($worksheet, '2020', [], 'GROWTH');
-function setYearlyData(Worksheet $worksheet, string $year, $yearlyData, ?string $title = null): void
+function setYearlyData(Worksheet $worksheet, string $year, array $yearlyData, ?string $title = null): void
{
// Set up some basic data
$worksheetTitle = $title ?: $year;
diff --git a/samples/DefinedNames/ScopedNamedRange.php b/samples/DefinedNames/ScopedNamedRange.php
index aa71454df0..88bc62777e 100644
--- a/samples/DefinedNames/ScopedNamedRange.php
+++ b/samples/DefinedNames/ScopedNamedRange.php
@@ -60,12 +60,18 @@
->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
+$range = $spreadsheet->getNamedRange('CHARGE_RATE');
+if ($range === null || $range->getWorksheet() === null) {
+ throw new Exception('expected named range not found');
+}
+$chargeRateCellValue = $spreadsheet
+ ->getSheetByNameOrThrow($range->getWorksheet()->getTitle())
+ ->getCell($range->getCellsInRange()[0])->getValue();
+
$helper->log(sprintf(
'Worked %.2f hours at a rate of %s - Charge to the client is %.2f',
$worksheet->getCell("B{$row}")->getCalculatedValue(),
- $chargeRateCellValue = $spreadsheet
- ->getSheetByName($spreadsheet->getNamedRange('CHARGE_RATE')->getWorksheet()->getTitle())
- ->getCell($spreadsheet->getNamedRange('CHARGE_RATE')->getCellsInRange()[0])->getValue(),
+ $chargeRateCellValue,
$worksheet->getCell("C{$row}")->getCalculatedValue()
));
diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php
index d7a1cb51e3..38ba4d9c45 100644
--- a/samples/Pdf/21b_Pdf.php
+++ b/samples/Pdf/21b_Pdf.php
@@ -21,7 +21,7 @@ function replaceBody(string $html): string
EOF;
- return preg_replace($bodystring, $bodyrepl, $html);
+ return preg_replace($bodystring, $bodyrepl, $html) ?? '';
}
require __DIR__ . '/../Header.php';
diff --git a/samples/Pdf/21c_Pdf.php b/samples/Pdf/21c_Pdf.php
index f556dcb2ff..6b6e6ab05f 100644
--- a/samples/Pdf/21c_Pdf.php
+++ b/samples/Pdf/21c_Pdf.php
@@ -16,7 +16,7 @@ function addHeadersFootersMpdf2000(string $html): string
odd-footer-name: html_myFooter2;
EOF;
- $html = preg_replace('/@page page0 {/', $pagerepl, $html);
+ $html = preg_replace('/@page page0 {/', $pagerepl, $html) ?? '';
$bodystring = '/