Merge pull request #4554 from oleibman/deprecations

Eliminate Deprecated Constants

Author: oleibman

CHANGELOG.md

@@ -10,14 +10,17 @@ and this project adheres to [Semantic Versioning](https://semver.org). Thia is a
 ### Breaking Changes
 
 - Images will be loaded from an external source (e.g. http://example.com/img.png) only if the reader is explicitly set to allow it via `$reader->setAllowExternalImages(true)`. We do not believe that loading of external images is a widely used feature.
+- Deletion of items deprecated in Release 4. See "removed" below.
+- Move some properties from Base Reader to Html Reader. [PR #4551](https://github.com/PHPOffice/PhpSpreadsheet/pull/4551)
+- DefaultValueBinder will treat integers with more than 15 digits as strings. [Issue #4522](https://github.com/PHPOffice/PhpSpreadsheet/issues/4522) [PR #4527](https://github.com/PHPOffice/PhpSpreadsheet/pull/4527)
 
 ### Added
 
 - Nothing yet.
 
 ### Removed
 
-- Nothing yet.
+- Theme public constants COLOR_SCHEME_2013_PLUS_NAME (use COLOR_SCHEME_2013_2022_NAME) and COLOR_SCHEME_2013_PLUS (use COLOR_SCHEME_2013_2022).
 
 ### Changed
 

src/PhpSpreadsheet/Theme.php

@@ -24,10 +24,7 @@ class Theme
         'hlink' => '0563C1',
         'folHlink' => '954F72',
     ];
-    /** @deprecated 4.4.0 Use COLOR_SCHEME_2013_2022_NAME */
-    public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
-    /** @deprecated 4.4.0 Use COLOR_SCHEME_2013_2022 */
-    public const COLOR_SCHEME_2013_PLUS = self::COLOR_SCHEME_2013_2022;
+    private const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
 
     public const COLOR_SCHEME_2007_2010_NAME = 'Office 2007-2010';
     public const COLOR_SCHEME_2007_2010 = [
@@ -177,16 +174,16 @@ public function getThemeColorName(): string
     /** @param null|string[] $themeColors */
     public function setThemeColorName(string $name, ?array $themeColors = null, ?Spreadsheet $spreadsheet = null): self
     {
+        if ($name === self::COLOR_SCHEME_2013_PLUS_NAME) {
+            // Ensure against this value being found in
+            // spreadsheets created while constant was public.
+            $name = self::COLOR_SCHEME_2013_2022_NAME;
+        }
         $this->themeColorName = $name;
         if ($name === self::COLOR_SCHEME_2007_2010_NAME) {
             $themeColors = $themeColors ?? self::COLOR_SCHEME_2007_2010;
             $this->majorFontLatin = 'Cambria';
             $this->minorFontLatin = 'Calibri';
-        } elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) { //* @phpstan-ignore-line
-            // delete this block when deprecated constants removed
-            $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS; //* @phpstan-ignore-line
-            $this->majorFontLatin = 'Calibri Light';
-            $this->minorFontLatin = 'Calibri';
         } elseif ($name === self::COLOR_SCHEME_2013_2022_NAME) {
             $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_2022;
             $this->majorFontLatin = 'Calibri Light';

tests/PhpSpreadsheetTests/Writer/Xlsx/ThemeColorsTest.php

@@ -12,17 +12,19 @@
 
 class ThemeColorsTest extends AbstractFunctional
 {
+    private const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
+
     public function testOffice2013Theme(): void
     {
         $spreadsheet = new Spreadsheet();
         $spreadsheet->getTheme()
             ->setThemeColorName(
-                SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME //* @phpstan-ignore-line
+                self::COLOR_SCHEME_2013_PLUS_NAME
             );
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
         $spreadsheet->disconnectWorksheets();
         self::assertSame(
-            SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME, //* @phpstan-ignore-line
+            SpreadsheetTheme::COLOR_SCHEME_2013_2022_NAME,
             $reloadedSpreadsheet->getTheme()->getThemeColorName()
         );
         self::assertSame('FFC000', $reloadedSpreadsheet->getTheme()->getThemeColors()['accent4']);