merged branch stealth35/trans_few_op (PR symfony#2093)

fabpot · fabpot · commit e0a3605e630e · 2011-09-06T07:38:29.000+02:00
Commits ------- 8d50c16 few optimisations for XliffFileLoader and XmlFileLoader Discussion ---------- few optimisations for XliffFileLoader and XmlFileLoader - file_put_contents + file_get_contents -> copy - use stripos insteed preg_match - removed useless `$tmpfiles` in XliffFileLoader
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -326,10 +326,10 @@ private function validateSchema(\DOMDocument $dom, $file)
         $imports = '';
         foreach ($schemaLocations as $namespace => $location) {
             $parts = explode('/', $location);
-            if (preg_match('#^phar://#i', $location)) {
+            if (0 === stripos($location, 'phar://')) {
                 $tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
                 if ($tmpfile) {
-                    file_put_contents($tmpfile, file_get_contents($location));
+                    copy($location, $tmpfile);
                     $tmpfiles[] = $tmpfile;
                     $parts = explode('/', str_replace('\\', '/', $tmpfile));
                 }
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -58,11 +58,10 @@ private function parseFile($file)
 
         $location = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd';
         $parts = explode('/', $location);
-        if (preg_match('#^phar://#i', $location)) {
+        if (0 === stripos($location, 'phar://')) {
             $tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
             if ($tmpfile) {
-                file_put_contents($tmpfile, file_get_contents($location));
-                $tmpfiles[] = $tmpfile;
+                copy($location, $tmpfile);
                 $parts = explode('/', str_replace('\\', '/', $tmpfile));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,10 @@ private function parseFile($file)`
`58`	`58`
`59`	`59`	`$location = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd';`
`60`	`60`	`$parts = explode('/', $location);`
`61`		`- if (preg_match('#^phar://#i', $location)) {`
	`61`	`+ if (0 === stripos($location, 'phar://')) {`
`62`	`62`	`$tmpfile = tempnam(sys_get_temp_dir(), 'sf2');`
`63`	`63`	`if ($tmpfile) {`
`64`		`- file_put_contents($tmpfile, file_get_contents($location));`
`65`		`- $tmpfiles[] = $tmpfile;`
	`64`	`+ copy($location, $tmpfile);`
`66`	`65`	`$parts = explode('/', str_replace('\\', '/', $tmpfile));`
`67`	`66`	`}`
`68`	`67`	`}`