Ticket #3102: xliff_formatting2.patch

Index: /Users/niko/www/vendor/symfony11/lib/i18n/sfMessageSource_XLIFF.class.php
===================================================================
--- /Users/niko/www/vendor/symfony11/lib/i18n/sfMessageSource_XLIFF.class.php   (revision 7855)
+++ /Users/niko/www/vendor/symfony11/lib/i18n/sfMessageSource_XLIFF.class.php   (working copy)
@@ -75,9 +75,10 @@
   /**
    * Creates and returns a new DOMDocument instance
    *
+   * @param  string  $xml_source  XML string
    * @return DOMDocument
    */
-  protected static function createDOMDocument()
+  protected static function createDOMDocument($xml_source = null)
   {
     $dom = new DOMDocument();
     $dom->formatOutput = true;
@@ -82,6 +83,10 @@
     $dom = new DOMDocument();
     $dom->formatOutput = true;
     $dom->preserveWhiteSpace = false;
+    if (!is_null($xml_source) && is_string($xml_source))
+    {
+      $dom->loadXML($xml_source);
+    }
     return $dom;
   }
 
@@ -186,6 +191,9 @@
     $fileNode = $xpath->query('//file')->item(0);
     $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
+    // Format document from current source (DOMPHP can't do this one shot)
+    $dom = self::createDOMDocument($dom->saveXML());
+
     // save it and clear the cache for this variant
     $dom->save($filename);
     if ($this->cache)
@@ -391,7 +399,9 @@
       throw new sfException(sprintf("Unable to create directory %s.", $dir));
     }
 
-    file_put_contents($file, $this->getTemplate($catalogue));
+    $dom = self::createDOMDocument();
+    $dom->loadXML($this->getTemplate($catalogue));
+    file_put_contents($file, $dom->saveXML());
     chmod($file, 0777);
 
     return array($variant, $file);