Eliminate XML Source Manipulation

Original solution required XML manipulation to overcome what appears to be an xpath problem. This version replaces xpath with iteration, eliminating the need to manipulate the XML.

Author: Owen Leibman

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -132,40 +132,6 @@ private function loadZip(string $filename, string $ns = ''): SimpleXMLElement
         return self::testSimpleXml($rels);
     }
 
-    private function loadStyleZip(string $filename, string $ns = ''): SimpleXMLElement
-    {
-        // With the following:
-        //    <x:styleSheet xmlns:x="whatever"...
-        // simplexml_load_file specifying namespace works fine,
-        // but xpath on the result does not. I can't figure out
-        // how to make xpath work in this circumstance, but I can
-        // manipulate the xml to the far more usual:
-        //    <stylesheet xmlns="whatever"...
-        // Ugly, but arguably serviceable.
-        $xml = $this->getFromZipArchive($this->zip, $filename);
-        $xmlns = " xmlns=\"$ns\"";
-        if (strpos($xml, $xmlns) === false) {
-            $pattern = "~ xmlns:([A-Za-z0-9_]+)=\"$ns\"~";
-            if (preg_match($pattern, $xml, $matches) === 1) {
-                $pattern = "~ xmlns:${matches[1]}=~";
-                $repl = Worksheet::pregReplace($pattern, ' xmlns=', $xml);
-                $pattern = "~<(/?)${matches[1]}:~";
-                $repl = Worksheet::pregReplace($pattern, '<$1', $repl);
-                if ($repl !== '') {
-                    $xml = $repl;
-                }
-            }
-        }
-        $rels = simplexml_load_string(
-            $this->securityScanner->scan($xml),
-            'SimpleXMLElement',
-            0,
-            $ns
-        );
-
-        return self::testSimpleXml($rels);
-    }
-
     // This function is just to identify cases where I'm not sure
     // why empty namespace is required.
     private function loadZipNonamespace(string $filename, string $ns): SimpleXMLElement
@@ -572,15 +538,31 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                     if ($xpath === null) {
                         $xmlStyles = self::testSimpleXml(null);
                     } else {
-                        $xmlStyles = $this->loadStyleZip("$dir/$xpath[Target]", $mainNS);
+                        $xmlStyles = $this->loadZip("$dir/$xpath[Target]", $mainNS);
                     }
 
-                    $xmlStyles->registerXPathNamespace('smm', $mainNS);
-                    $fills = self::xpathNoFalse($xmlStyles, 'smm:fills/smm:fill');
-                    $fonts = self::xpathNoFalse($xmlStyles, 'smm:fonts/smm:font');
-                    $borders = self::xpathNoFalse($xmlStyles, 'smm:borders/smm:border');
-                    $xfTags = self::xpathNoFalse($xmlStyles, 'smm:cellXfs/smm:xf');
-                    $cellXfTags = self::xpathNoFalse($xmlStyles, 'smm:cellStyleXfs/smm:xf');
+                    $fills = [];
+                    $fonts = [];
+                    $borders = [];
+                    $xfTags = [];
+                    $cellXfTags = [];
+                    if (count($xmlStyles) > 0) {
+                        foreach ($xmlStyles->fills->fill as $fill) {
+                            $fills[] = $fill;
+                        }
+                        foreach ($xmlStyles->fonts->font as $font) {
+                            $fonts[] = $font;
+                        }
+                        foreach ($xmlStyles->borders->border as $border) {
+                            $borders[] = $border;
+                        }
+                        foreach ($xmlStyles->cellXfs->xf as $xf) {
+                            $xfTags[] = $xf;
+                        }
+                        foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
+                            $cellXfTags[] = $xf;
+                        }
+                    }
 
                     $styles = [];
                     $cellStyles = [];