Remove leading slash when required

PHPOffice · Dec 11, 2023 · c5d8264 · c5d8264
1 parent 8303744
commit c5d8264
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Common/XMLReader.php b/src/Common/XMLReader.php
@@ -61,6 +61,12 @@ public function getDomFromZip(string $zipFile, string $xmlFile)
         $zip = new \ZipArchive();
         $zip->open($zipFile);
         $content = $zip->getFromName($xmlFile);
+
+        // Files downloaded from Sharepoint are somehow different and fail on the leading slash.
+        if ($content === false && substr($xmlFile, 0, 1) === '/') {
+            $content = $zip->getFromName(substr($xmlFile, 1));
+        }
+
         $zip->close();
 
         if ($content === false) {

diff --git a/tests/Common/Tests/XMLReaderTest.php b/tests/Common/Tests/XMLReaderTest.php
@@ -51,13 +51,24 @@ public function testDomFromZip(): void
         $pathResources = PHPOFFICE_COMMON_TESTS_BASE_DIR . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'files' . DIRECTORY_SEPARATOR;
 
         $reader = new XMLReader();
-        $reader->getDomFromZip($pathResources . 'reader.zip', 'test.xml');
+        $this->assertInstanceOf(\DOMDocument::class, $reader->getDomFromZip($pathResources . 'reader.zip', 'test.xml'));
 
         $this->assertTrue($reader->elementExists('/element/child'));
 
         $this->assertFalse($reader->getDomFromZip($pathResources . 'reader.zip', 'non_existing_xml_file.xml'));
     }
 
+    /**
+     * Test reading XML from zip
+     */
+    public function testDomFromZipWithSharepointPath(): void
+    {
+        $pathResources = PHPOFFICE_COMMON_TESTS_BASE_DIR . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'files' . DIRECTORY_SEPARATOR;
+
+        $reader = new XMLReader();
+        $this->assertInstanceOf(\DOMDocument::class, $reader->getDomFromZip($pathResources . 'reader.zip', '/test.xml'));
+    }
+
     /**
      * Test that read from non existing archive throws exception
      */