Merge branch 'master' into powerkiki

PHPOffice · Jan 4, 2024 · c01abbc · c01abbc
2 parents 50f6afc + 2e4b8f8
commit c01abbc
Show file tree

Hide file tree

Showing 147 changed files with 4,435 additions and 1,815 deletions.
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -4,8 +4,12 @@ on:
     tags:
       - '*'
 
+permissions: {}
 jobs:
   github-pages:
+    permissions:
+      contents: write # to push pages branch (peaceiris/actions-gh-pages)
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,7 @@
 name: main
-on: [ push, pull_request ]
+on: [ push, pull_request, merge_group ]
+permissions:
+  contents: read # to fetch code (actions/checkout)
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -110,7 +112,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Code style with PHP-CS-Fixer
-        run: ./vendor/bin/php-cs-fixer fix --format=checkstyle | cs2pr
+        run: (./vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr) || ./vendor/bin/php-cs-fixer fix --diff --dry-run
 
   phpcs:
     runs-on: ubuntu-latest
@@ -241,6 +243,8 @@ jobs:
           ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage-clover.xml
 
   release:
+    permissions:
+      contents: write # to create a release (actions/create-release)
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     steps:

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -3,6 +3,7 @@
 $finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
     ->notPath('src/PhpSpreadsheet/Writer/ZipStream3.php')
+    ->name('/(\.php|^generate-document|^generate-locales)$/')
     ->in(__DIR__);
 
 $config = new PhpCsFixer\Config();

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
@@ -5,6 +5,9 @@
     <file>samples</file>
     <file>src</file>
     <file>tests</file>
+    <file>infra</file>
+    <file>bin/generate-document</file>
+    <file>bin/generate-locales</file>
 
     <exclude-pattern>samples/Header.php</exclude-pattern>
     <exclude-pattern>*/tests/Core/*/*Test\.(inc|css|js)$</exclude-pattern>

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,12 @@
+# Read the Docs configuration file for MkDocs projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html
+
+version: 2
+
+build:
+    os: ubuntu-22.04
+    tools:
+        python: "3"
+
+mkdocs:
+    configuration: mkdocs.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,11 @@ 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)
+- Chart Axis Display Units and Logarithmic Scale. [Issue #3833](https://github.com/PHPOffice/PhpSpreadsheet/pull/3833) [PR #3836](https://github.com/PHPOffice/PhpSpreadsheet/pull/3836)
 
 ### Changed
 
@@ -35,7 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Deprecated
 
-- Nothing
+- Functions `_translateFormulaToLocale` and `_translateFormulaEnglish` are replaced by versions without leading underscore. [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
 
 ### Removed
 
@@ -72,6 +77,18 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - 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)
+- Consistent handling of decimal/thousands separators between StringHelper and Php setlocale. [Issue #3811](https://github.com/PHPOffice/PhpSpreadsheet/issues/3811) [PR #3815](https://github.com/PHPOffice/PhpSpreadsheet/pull/3815)
+- Clone worksheet with tables or charts. [Issue #3820](https://github.com/PHPOffice/PhpSpreadsheet/issues/3820) [PR #3821](https://github.com/PHPOffice/PhpSpreadsheet/pull/3821)
+- COUNTIFS Does Not Require xlfn. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3827](https://github.com/PHPOffice/PhpSpreadsheet/pull/3827)
+- Strip `xlfn.` and `xlws.` from Formula Translations. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
+- Recurse directories searching for font file. [Issue #2809](https://github.com/PHPOffice/PhpSpreadsheet/issues/2809) [PR #3830](https://github.com/PHPOffice/PhpSpreadsheet/pull/3830)
+- Reduce memory consumption of Worksheet::rangeToArray() when many empty rows are read. [Issue #3814](https://github.com/PHPOffice/PhpSpreadsheet/pull/3814) [PR #3834](https://github.com/PHPOffice/PhpSpreadsheet/pull/3834)
+- Reduce time used by Worksheet::rangeToArray() when many empty rows are read. [PR #3839](https://github.com/PHPOffice/PhpSpreadsheet/pull/3839)
+- Html Reader Tolerate Invalid Sheet Title. [PR #3845](https://github.com/PHPOffice/PhpSpreadsheet/pull/3845)
+- Do not include unparsed drawings when new drawing added. [Issue #3843](https://github.com/PHPOffice/PhpSpreadsheet/pull/3843) [PR #3846](https://github.com/PHPOffice/PhpSpreadsheet/pull/3846)
 
 ## 1.29.0 - 2023-06-15
 

diff --git a/bin/generate-document b/bin/generate-document
@@ -6,20 +6,14 @@ use PhpOffice\PhpSpreadsheetInfra\DocumentGenerator;
 
 require_once 'vendor/autoload.php';
 
-try {
-    $phpSpreadsheetFunctionsProperty = (new ReflectionClass(Calculation::class))
-        ->getProperty('phpSpreadsheetFunctions');
-    $phpSpreadsheetFunctionsProperty->setAccessible(true);
-    $phpSpreadsheetFunctions = $phpSpreadsheetFunctionsProperty->getValue();
-    ksort($phpSpreadsheetFunctions);
+$phpSpreadsheetFunctions = Calculation::getFunctions();
+ksort($phpSpreadsheetFunctions);
 
-    file_put_contents(__DIR__ . '/../docs/references/function-list-by-category.md',
-        DocumentGenerator::generateFunctionListByCategory($phpSpreadsheetFunctions)
-    );
-    file_put_contents(__DIR__ . '/../docs/references/function-list-by-name.md',
-        DocumentGenerator::generateFunctionListByName($phpSpreadsheetFunctions)
-    );
-} catch (ReflectionException $e) {
-    fwrite(STDERR, (string) $e);
-    exit(1);
-}
+file_put_contents(
+    __DIR__ . '/../docs/references/function-list-by-category.md',
+    DocumentGenerator::generateFunctionListByCategory($phpSpreadsheetFunctions)
+);
+file_put_contents(
+    __DIR__ . '/../docs/references/function-list-by-name.md',
+    DocumentGenerator::generateFunctionListByName($phpSpreadsheetFunctions)
+);
diff --git a/bin/generate-locales b/bin/generate-locales
@@ -6,20 +6,12 @@ use PhpOffice\PhpSpreadsheetInfra\LocaleGenerator;
 
 require_once 'vendor/autoload.php';
 
-try {
-    $phpSpreadsheetFunctionsProperty = (new ReflectionClass(Calculation::class))
-        ->getProperty('phpSpreadsheetFunctions');
-    $phpSpreadsheetFunctionsProperty->setAccessible(true);
-    $phpSpreadsheetFunctions = $phpSpreadsheetFunctionsProperty->getValue();
+$phpSpreadsheetFunctions = Calculation::getFunctions();
 
-    $localeGenerator = new LocaleGenerator(
-        realpath(__DIR__ . '/../src/PhpSpreadsheet/Calculation/locale/'),
-        'Translations.xlsx',
-        $phpSpreadsheetFunctions,
-        true
-    );
-    $localeGenerator->generateLocales();
-} catch (\Exception $e) {
-    fwrite(STDERR, (string) $e);
-    exit(1);
-}
+$localeGenerator = new LocaleGenerator(
+    __DIR__ . '/../src/PhpSpreadsheet/Calculation/locale/',
+    'Translations.xlsx',
+    $phpSpreadsheetFunctions,
+    true
+);
+$localeGenerator->generateLocales();