Merge pull request #4143 from oleibman/deprecated2

Remove Deprecations from Release 2

Author: oleibman

CHANGELOG.md

@@ -25,6 +25,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Nothing yet.
 
+### Removed
+
+- The following items were deprecated in release 2 and are now removed.
+- Writer\Xls\Style\ColorMap (no longer needed).
+- Reader\Xml::trySimpleXMLLoadString (should not have been public, no public replacement).
+- Calculation\Calculation::_translateFormulaToLocale (use method name translateFormulaToLocale without leading underscore).
+- Calculation\Calculation::_translateFormulaToEnglish (use method name translateFormulaToEnglish without leading underscore).
+
 ### Moved
 
 - Nothing yet.

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -3318,16 +3318,6 @@ private static function translateFormula(array $from, array $to, string $formula
 
     private static ?array $functionReplaceToLocale;
 
-    /**
-     * @deprecated 1.30.0 use translateFormulaToLocale() instead
-     *
-     * @codeCoverageIgnore
-     */
-    public function _translateFormulaToLocale(string $formula): string
-    {
-        return $this->translateFormulaToLocale($formula);
-    }
-
     public function translateFormulaToLocale(string $formula): string
     {
         $formula = preg_replace(self::CALCULATION_REGEXP_STRIP_XLFN_XLWS, '', $formula) ?? '';
@@ -3365,16 +3355,6 @@ public function translateFormulaToLocale(string $formula): string
 
     private static ?array $functionReplaceToExcel;
 
-    /**
-     * @deprecated 1.30.0 use translateFormulaToEnglish() instead
-     *
-     * @codeCoverageIgnore
-     */
-    public function _translateFormulaToEnglish(string $formula): string
-    {
-        return $this->translateFormulaToEnglish($formula);
-    }
-
     public function translateFormulaToEnglish(string $formula): string
     {
         if (self::$functionReplaceFromLocale === null) {

src/PhpSpreadsheet/Reader/Xml.php

@@ -107,20 +107,6 @@ public function canRead(string $filename): bool
         return $valid;
     }
 
-    /**
-     * Check if the file is a valid SimpleXML.
-     *
-     * @return false|SimpleXMLElement
-     *
-     * @deprecated 2.0.1 Should never have had public visibility
-     *
-     * @codeCoverageIgnore
-     */
-    public function trySimpleXMLLoadString(string $filename, string $fileOrString = 'file'): SimpleXMLElement|bool
-    {
-        return $this->trySimpleXMLLoadStringPrivate($filename, $fileOrString);
-    }
-
     /** @return false|SimpleXMLElement */
     private function trySimpleXMLLoadStringPrivate(string $filename, string $fileOrString = 'file'): SimpleXMLElement|bool
     {

src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php

@@ -43,10 +43,10 @@ public function testTranslation(string $expectedResult, string $locale, string $
             self::markTestSkipped("Unable to set locale to {$locale}");
         }
 
-        $translatedFormula = Calculation::getInstance()->_translateFormulaToLocale($formula);
+        $translatedFormula = Calculation::getInstance()->translateFormulaToLocale($formula);
         self::assertSame($expectedResult, $translatedFormula);
 
-        $restoredFormula = Calculation::getInstance()->_translateFormulaToEnglish($translatedFormula);
+        $restoredFormula = Calculation::getInstance()->translateFormulaToEnglish($translatedFormula);
         self::assertSame(preg_replace(Calculation::CALCULATION_REGEXP_STRIP_XLFN_XLWS, '', $formula), $restoredFormula);
     }