Merge pull request #90 from researchgate/libxml_entity_loader_disabled

Load configuration even if libxml entity loader is disabled
paratestphp · Apr 29, 2014 · f0639c6 · f0639c6
2 parents 4667114 + 9dba8d4
commit f0639c6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/ParaTest/Runners/PHPUnit/Configuration.php b/src/ParaTest/Runners/PHPUnit/Configuration.php
@@ -34,13 +34,16 @@ class Configuration
     public function __construct($path)
     {
         $this->path = $path;
-        if(file_exists($path))
+        if(file_exists($path)) {
+            $before = libxml_disable_entity_loader(false);
             $this->xml = simplexml_load_file($path);
+            libxml_disable_entity_loader($before);
+        }
     }
-    
+
     /**
      * Get the bootstrap PHPUnit configuration attribute
-     * 
+     *
      * @return string The bootstrap attribute or empty string if not set
      */
     public function getBootstrap()

diff --git a/test/ParaTest/Runners/PHPUnit/ConfigurationTest.php b/test/ParaTest/Runners/PHPUnit/ConfigurationTest.php
@@ -44,4 +44,20 @@ public function testSuitesContainPathAsValue($suites)
         $this->assertEquals(array($basePath . 'it' . DS . 'ParaTest'), $suites["ParaTest Integration Tests"]);
         $this->assertEquals(array($basePath . 'functional'), $suites["ParaTest Functional Tests"]);
     }
+
+    public function testLoadConfigEvenIfLibXmlEntityLoaderIsDisabled()
+    {
+        $before = libxml_disable_entity_loader();
+        $e = null;
+
+        try {
+            $this->config = new Configuration($this->path);
+        } catch (\Exception $exc) {
+            $e = $exc;
+        }
+
+        libxml_disable_entity_loader($before);
+
+        $this->assertNull($e, 'Could not instantiate Configuration: ' . ($e instanceof \Exception ? $e->getMessage() : 'no error given'));
+    }
 }