merged branch igorw/protected-fileloader (PR #5981)

fabpot · fabpot · commit d55d3b823d92 · 2012-11-12T10:50:10.000+01:00
This PR was merged into the 2.1 branch. Commits ------- c659e78 Make YamlFileLoader and XmlFileLoader file loading extensible Discussion ---------- Make YamlFileLoader and XmlFileLoader file loading extensible Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes License of the code: MIT Documentation PR: not needed For phpBB we want to use a non-dumped container in the dev env to prevent having to clear the cache all the time. We're creating the container twice because we need some information at compile time which must be fetched from the container. The process is as follows: Create temp container, get list of installed extensions (think bundles), create a compiler pass with the extensions list, create a new container with that compiler pass, compile it, dump it. The problem is that we need to load and parse the YAML twice which is really slow. Caching it in the YamlFileLoader should save 50-100ms per page load. By changing visibility to protected it becomes possible to extend the loader and cache file contents.
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -204,7 +204,7 @@ private function parseDefinition($id, $service, $file)
      *
      * @throws \InvalidArgumentException When loading of XML file returns error
      */
-    private function parseFile($file)
+    protected function parseFile($file)
     {
         $internalErrors = libxml_use_internal_errors(true);
         $disableEntities = libxml_disable_entity_loader(true);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -233,7 +233,7 @@ private function parseDefinition($id, $service, $file)
      *
      * @return array The file content
      */
-    private function loadFile($file)
+    protected function loadFile($file)
     {
         return $this->validate(Yaml::parse($file), $file);
     }

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private function parseDefinition($id, $service, $file)`
`204`	`204`	`*`
`205`	`205`	`* @throws \InvalidArgumentException When loading of XML file returns error`
`206`	`206`	`*/`
`207`		`- private function parseFile($file)`
	`207`	`+ protected function parseFile($file)`
`208`	`208`	`{`
`209`	`209`	`$internalErrors = libxml_use_internal_errors(true);`
`210`	`210`	`$disableEntities = libxml_disable_entity_loader(true);`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ private function parseDefinition($id, $service, $file)`
`233`	`233`	`*`
`234`	`234`	`* @return array The file content`
`235`	`235`	`*/`
`236`		`- private function loadFile($file)`
	`236`	`+ protected function loadFile($file)`
`237`	`237`	`{`
`238`	`238`	`return $this->validate(Yaml::parse($file), $file);`
`239`	`239`	`}`