Settings: deleted libxml_disable_entity_loader() calls since they're …

…not necessary. Prevent setLibXmlLoaderOptions() and getLibXmlLoaderOptions() to call the libxml_disable_entity_loader() function which alter the global state of libxml. See the discussion here PHPOffice#74
redokun · Mar 12, 2017 · 6a0a5d9 · 6a0a5d9
1 parent de57bf7
commit 6a0a5d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php
@@ -237,7 +237,6 @@ public static function setLibXmlLoaderOptions($options = null)
         if (is_null($options) && defined('LIBXML_DTDLOAD')) {
             $options = LIBXML_DTDLOAD | LIBXML_DTDATTR;
         }
-        @libxml_disable_entity_loader((bool) $options);
         self::$libXmlLoaderOptions = $options;
     }
 
@@ -254,7 +253,6 @@ public static function getLibXmlLoaderOptions()
         } elseif (is_null(self::$libXmlLoaderOptions)) {
             self::$libXmlLoaderOptions = true;
         }
-        @libxml_disable_entity_loader((bool) self::$libXmlLoaderOptions);
 
         return self::$libXmlLoaderOptions;
     }

diff --git a/tests/PhpSpreadsheetTests/SettingsTest.php b/tests/PhpSpreadsheetTests/SettingsTest.php
@@ -4,20 +4,34 @@
 
 class SettingsTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var string
+     */
+    protected $prevValue;
+
     public function setUp()
     {
+        $this->prevValue = libxml_disable_entity_loader();
+        libxml_disable_entity_loader(false); // Enable entity loader
+    }
+
+    protected function tearDown()
+    {
+        libxml_disable_entity_loader($this->prevValue);
     }
 
     public function testGetXMLSettings()
     {
         $result = \PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions();
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR) & $result));
+        $this->assertFalse(libxml_disable_entity_loader());
     }
 
     public function testSetXMLSettings()
     {
         \PhpOffice\PhpSpreadsheet\Settings::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID);
         $result = \PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions();
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result));
+        $this->assertFalse(libxml_disable_entity_loader());
     }
 }