Commitd60d4e0

committed

force enabling the external XML entity loaders

1 parent00763f6 commitd60d4e0Copy full SHA for d60d4e0

File tree

+33

-1

lines changed

+33

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,6 @@ private function processAnonymousServices(\DOMDocument $xml, $file)`
`315`	`315`	`foreach ($definitionsas$id =>$def) {`
`316`	`316`	`list($domElement,$file,$wild) =$def;`
`317`	`317`
`318`		`-`
`319`	`318`	`if (null !==$definition =$this->parseDefinition($domElement,$file)) {`
`320`	`319`	`$this->container->setDefinition($id,$definition);`
`321`	`320`	`}`
`@@ -485,7 +484,9 @@ public function validateSchema(\DOMDocument $dom)`
`485`	`484`	`EOF`
`486`	`485`	`;`
`487`	`486`
	`487`	`+$disableEntities =libxml_disable_entity_loader(false);`
`488`	`488`	`$valid = @$dom->schemaValidateSource($source);`
	`489`	`+libxml_disable_entity_loader($disableEntities);`
`489`	`490`
`490`	`491`	`foreach ($tmpfilesas$tmpfile) {`
`491`	`492`	`@unlink($tmpfile);`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,19 @@ public function testParseFile()`
`84`	`84`	`$this->assertInstanceOf('DOMDocument',$xml,'->parseFileToDOM() returns an SimpleXMLElement object');`
`85`	`85`	`}`
`86`	`86`
	`87`	`+publicfunctiontestLoadWithExternalEntitiesDisabled()`
	`88`	`+ {`
	`89`	`+$disableEntities =libxml_disable_entity_loader(true);`
	`90`	`+`
	`91`	`+$containerBuilder =newContainerBuilder();`
	`92`	`+$loader =newXmlFileLoader($containerBuilder,newFileLocator(self::$fixturesPath.'/xml'));`
	`93`	`+$loader->load('services2.xml');`
	`94`	`+`
	`95`	`+libxml_disable_entity_loader($disableEntities);`
	`96`	`+`
	`97`	`+$this->assertTrue(count($containerBuilder->getParameterBag()->all()) >0,'Parameters can be read from the config file.');`
	`98`	`+ }`
	`99`	`+`
`87`	`100`	`publicfunctiontestLoadParameters()`
`88`	`101`	`{`
`89`	`102`	`$container =newContainerBuilder();`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,14 @@ private function parseFile($file)`
`143`	`143`	`$source =file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-1.2-strict.xsd');`
`144`	`144`	`$source =str_replace('http://www.w3.org/2001/xml.xsd',$location,$source);`
`145`	`145`
	`146`	`+$disableEntities =libxml_disable_entity_loader(false);`
	`147`	`+`
`146`	`148`	`if (!@$dom->schemaValidateSource($source)) {`
`147`	`149`	`thrownewInvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s',$file,implode("\n",$this->getXmlErrors($internalErrors))));`
`148`	`150`	`}`
`149`	`151`
	`152`	`+libxml_disable_entity_loader($disableEntities);`
	`153`	`+`
`150`	`154`	`$dom->normalizeDocument();`
`151`	`155`
`152`	`156`	`libxml_clear_errors();`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,20 @@ public function testLoadWithInternalErrorsEnabled()`
`46`	`46`	`libxml_use_internal_errors($internalErrors);`
`47`	`47`	`}`
`48`	`48`
	`49`	`+publicfunctiontestLoadWithExternalEntitiesDisabled()`
	`50`	`+ {`
	`51`	`+$disableEntities =libxml_disable_entity_loader(true);`
	`52`	`+`
	`53`	`+$loader =newXliffFileLoader();`
	`54`	`+$resource =__DIR__.'/../fixtures/resources.xlf';`
	`55`	`+$catalogue =$loader->load($resource,'en','domain1');`
	`56`	`+`
	`57`	`+libxml_disable_entity_loader($disableEntities);`
	`58`	`+`
	`59`	`+$this->assertEquals('en',$catalogue->getLocale());`
	`60`	`+$this->assertEquals(array(newFileResource($resource)),$catalogue->getResources());`
	`61`	`+ }`
	`62`	`+`
`49`	`63`	`publicfunctiontestLoadWithResname()`
`50`	`64`	`{`
`51`	`65`	`$loader =newXliffFileLoader();`

Comments

(0)