Didn't Like My Approach In 2 Places

Author: oleibman

src/PhpSpreadsheet/Helper/Dimension.php

@@ -14,7 +14,6 @@ class Dimension
     public const UOM_PIXELS = 'px';
     public const UOM_POINTS = 'pt';
     public const UOM_PICA = 'pc';
-    public const ABSOLUTE_DEFAULT_UNIT = 'px';
 
     /**
      * Based on 96 dpi.
@@ -53,7 +52,7 @@ class Dimension
 
     protected ?string $unit = null;
 
-    public function __construct(string $dimension, ?string $absoluteDefaultUnit = self::ABSOLUTE_DEFAULT_UNIT)
+    public function __construct(string $dimension)
     {
         $size = 0.0;
         $unit = '';
@@ -66,7 +65,7 @@ public function __construct(string $dimension, ?string $absoluteDefaultUnit = se
         // If a UoM is specified, then convert the size to pixels for internal storage
         if (isset(self::ABSOLUTE_UNITS[$unit])) {
             $size *= self::ABSOLUTE_UNITS[$unit];
-            $this->unit = $absoluteDefaultUnit;
+            $this->unit = self::UOM_PIXELS;
         } elseif (isset(self::RELATIVE_UNITS[$unit])) {
             $size *= self::RELATIVE_UNITS[$unit];
             $size = round($size, 4);

src/PhpSpreadsheet/Reader/Html.php

@@ -1111,7 +1111,7 @@ private function insertImage(Worksheet $sheet, string $column, int $row, array $
         if (!isset($attributes['src'])) {
             return;
         }
-        $styleArray = self::getStyleArray($attributes, null);
+        $styleArray = self::getStyleArray($attributes);
 
         $src = $attributes['src'];
         if (substr($src, 0, 5) !== 'data:') {
@@ -1169,7 +1169,7 @@ private function insertImage(Worksheet $sheet, string $column, int $row, array $
      *
      * @return mixed[]
      */
-    private static function getStyleArray(array $attributes, ?string $defaultAbsoluteUnit = CssDimension::ABSOLUTE_DEFAULT_UNIT): array
+    private static function getStyleArray(array $attributes): array
     {
         $styleArray = [];
         if (isset($attributes['style'])) {
@@ -1183,13 +1183,13 @@ private static function getStyleArray(array $attributes, ?string $defaultAbsolut
                         if (substr($arrayValue, -2) === 'px') {
                             $arrayValue = (string) (((float) substr($arrayValue, 0, -2)));
                         } else {
-                            $arrayValue = (new CssDimension($arrayValue, $defaultAbsoluteUnit))->width();
+                            $arrayValue = (new CssDimension($arrayValue))->toUnit(CssDimension::UOM_PIXELS);
                         }
                     } elseif ($arrayKey === 'height') {
                         if (substr($arrayValue, -2) === 'px') {
                             $arrayValue = substr($arrayValue, 0, -2);
                         } else {
-                            $arrayValue = (new CssDimension($arrayValue, $defaultAbsoluteUnit))->height();
+                            $arrayValue = (new CssDimension($arrayValue))->toUnit(CssDimension::UOM_PIXELS);
                         }
                     }
                     $styleArray[$arrayKey] = $arrayValue;

src/PhpSpreadsheet/Reader/XlsBase.php

@@ -133,11 +133,6 @@ class XlsBase extends BaseReader
      */
     protected string $codepage = '';
 
-    /**
-     * @deprecated 5.2.0 Serves no useful purpose. No replacement.
-     *
-     * @codeCoverageIgnore
-     */
     public function setCodepage(string $codepage): void
     {
         if (CodePage::validate($codepage) === false) {

tests/PhpSpreadsheetTests/Reader/Xls/InfoNamesTest.php

@@ -117,6 +117,17 @@ public function testWorksheetInfoBiff5Mac(): void
         self::assertContains($reader->getCodepage(), self::MAC_CE);
     }
 
+    public function testWorksheetNamesBiff5Special(): void
+    {
+        // Sadly, no unit test was added for PR #1484,
+        // so we have to invent a fake one now.
+        $reader = new XlsSpecialCodePage();
+        $reader->setCodePage('CP855'); // use Cyrillic rather than MACCENTRAL
+        $names = $reader->listWorksheetNames(self::MAC_FILE5);
+        $expected = ['ђrkusz1']; // first character interpreted as Cyrillic
+        self::assertSame($expected, $names);
+    }
+
     public function testLoadMacCentralEuropeBiff5(): void
     {
         $reader = new Xls();

tests/PhpSpreadsheetTests/Reader/Xls/XlsSpecialCodePage.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Shared\CodePage;
+
+class XlsSpecialCodePage extends \PhpOffice\PhpSpreadsheet\Reader\Xls
+{
+    protected function readCodepage(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; code page identifier
+        $codepage = self::getUInt2d($recordData, 0);
+
+        if ($this->codepage === '') {
+            $this->codepage = CodePage::numberToName($codepage);
+        }
+    }
+}