diff --git a/DEBIAN/conffiles b/DEBIAN/conffiles
index fd08990..317caf0 100644
--- a/DEBIAN/conffiles
+++ b/DEBIAN/conffiles
@@ -1 +1,2 @@
 /etc/wetddump/mysql.yml
+/etc/wetddump/mongodb.yml
diff --git a/DEBIAN/control b/DEBIAN/control
index 4321916..7f64a57 100644
--- a/DEBIAN/control
+++ b/DEBIAN/control
@@ -1,8 +1,8 @@
 Package: wetddump
-Version: 0.4
+Version: 1.1
 Section: base
 Priority: optional
 Architecture: all
-Depends: php5 (>= 5.3.3-7+squeeze15), mysql-server (>= 5.1.66-0+squeeze1)|percona-xtradb-cluster-56, rsync
-Maintainer: Simon Vieille <simon@webetdesign.com>
+Depends: php5 (>= 5.3.3-7+squeeze15), rsync
+Maintainer: Simon Vieille <contact@deblan.fr>
 Description: Backup manager
diff --git a/etc/wetddump/mongodb.yml b/etc/wetddump/mongodb.yml
new file mode 100644
index 0000000..7b11628
--- /dev/null
+++ b/etc/wetddump/mongodb.yml
@@ -0,0 +1,13 @@
+settings:
+    dir:      '/var/lib/mongodbdump/'
+    log:      '/var/log/wetddump/mongodb.log'
+    mongodb:  '/var/lib/mongodb/'
+    complete:
+        dir:     'complete/'
+        enabled: false
+    mongodump:
+        dir:     'dump/'
+        username:
+        password:
+        enabled: true
+        options: []
diff --git a/usr/bin/wetddump-mongodb b/usr/bin/wetddump-mongodb
new file mode 100755
index 0000000..bd0b739
--- /dev/null
+++ b/usr/bin/wetddump-mongodb
@@ -0,0 +1,58 @@
+#!/usr/bin/php5
+<?php
+
+require_once '/usr/share/wetddump/functions.php';
+
+mySfYaml::load('/etc/wetddump/mongodb.yml');
+
+$log = mySfYaml::get('settings_log', '/var/log/wetddump/mongodb.log');
+$dir = mySfYaml::get('settings_dir', '/var/lib/mongodbdump/');
+
+if (!is_dir($dir)) {
+    $cmd = sprintf('mkdir -p %s', escapeshellarg($dir));
+    log_($cmd, $log);
+    exec_($cmd);
+}
+
+$cmd = sprintf('chdir %s', $dir);
+log_($cmd, $log);
+chdir($dir);
+
+if (mySfYaml::get('settings_complete_enabled')) {
+    $cdir = mySfYaml::get('settings_complete_dir', 'complete/');
+
+    $cmd = sprintf('rm -rf %s', escapeshellarg($cdir));
+    log_($cmd, $log);
+    exec_($cmd);
+
+    $cmd = sprintf('mkdir -p %s', escapeshellarg($cdir));
+    log_($cmd, $log);
+    exec_($cmd);
+
+    $cmd = sprintf('rsync -avz --delete %s/* %s', mySfYaml::get('settings_mongodb'), $cdir);
+    log_($cmd, $log);
+    exec_($cmd);
+}
+
+if (mySfYaml::get('settings_mongodump_enabled')) {
+    $cdir = mySfYaml::get('settings_mongodump_dir', 'bson/');
+
+    $cmd = sprintf('rm -rf %s', escapeshellarg($cdir));
+    log_($cmd, $log);
+    exec_($cmd);
+
+    $cmd = sprintf('mkdir -p %s', escapeshellarg($cdir));
+    log_($cmd, $log);
+    exec_($cmd);
+
+    $options = mySfYaml::get('settings_mongodump_options', array());
+
+    $cmd = getMongodumpCmd(
+        mySfYaml::get('settings_mongodump_username', null),
+        mySfYaml::get('settings_mongodump_password', null),
+        implode(' ', $options),
+        $cdir
+    );
+
+    exec_($cmd);
+}
diff --git a/usr/bin/wetddump-mysql b/usr/bin/wetddump-mysql
index 8df0c90..0906c71 100755
--- a/usr/bin/wetddump-mysql
+++ b/usr/bin/wetddump-mysql
@@ -70,7 +70,7 @@ if (mySfYaml::get('settings_mysqldump_enabled')) {
         exec_($cmd);
     }
 
-	$cmd = getMysqlPrivilegesDumpCmd(sprintf('%s/privileges.%s.sql', $cdir, date('Y-m-d')));
-	log_('Dump of privileges', $log);
-	exec_($cmd);
+    $cmd = getMysqlPrivilegesDumpCmd(sprintf('%s/privileges.%s.sql', $cdir, date('Y-m-d')));
+    log_('Dump of privileges', $log);
+    exec_($cmd);
 }
diff --git a/usr/share/wetddump/functions.php b/usr/share/wetddump/functions.php
index bffbc98..b384ed8 100644
--- a/usr/share/wetddump/functions.php
+++ b/usr/share/wetddump/functions.php
@@ -31,7 +31,7 @@ function getMysqlDatabases()
 {
     mysql_connect('localhost', getMysqldumpUser(), getMysqldumpPassword()) or die(mysql_error());
     $results = mysql_query('SHOW DATABASES');
-    $bases   = array();
+    $bases = array();
 
     while ($fetch = mysql_fetch_array($results)) {
         $bases[] = $fetch[0];
@@ -60,3 +60,16 @@ function getMysqlPrivilegesDumpCmd($output)
 
     return $cmd;
 }
+
+function getMongodumpCmd($username, $password, $options, $output)
+{
+    $cmd = sprintf(
+        'mongodump %s %s %s --out %s',
+        !empty($username) ? '-u '.escapeshellarg($username) : '',
+        !empty($password) ? '-p '.escapeshellarg($password) : null,
+        $options,
+        $output
+    );
+
+    return $cmd;
+}
diff --git a/usr/share/wetddump/sfYaml.class.php b/usr/share/wetddump/sfYaml.class.php
index f238e95..045078a 100644
--- a/usr/share/wetddump/sfYaml.class.php
+++ b/usr/share/wetddump/sfYaml.class.php
@@ -11,14 +11,13 @@
 /**
  * sfYaml offers convenience methods to load and dump YAML.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYaml.class.php 8988 2008-05-15 20:24:26Z fabien $
  */
 class sfYaml
 {
-  protected static $spec = '1.2';
+    protected static $spec = '1.2';
 
   /**
    * Sets the YAML specification version to use.
@@ -27,11 +26,11 @@ class sfYaml
    */
   public static function setSpecVersion($version)
   {
-    if (!in_array($version, array('1.1', '1.2'))) {
-      throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
-    }
+      if (!in_array($version, array('1.1', '1.2'))) {
+          throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
+      }
 
-    self::$spec = $version;
+      self::$spec = $version;
   }
 
   /**
@@ -41,7 +40,7 @@ class sfYaml
    */
   public static function getSpecVersion()
   {
-    return self::$spec;
+      return self::$spec;
   }
 
   /**
@@ -64,15 +63,15 @@ class sfYaml
    */
   public static function load($input)
   {
-    $file = '';
+      $file = '';
 
     // if input is a file, process it
     if (strpos($input, "\n") === false && is_file($input)) {
-      $file = $input;
+        $file = $input;
 
-      ob_start();
-      $retval = include($input);
-      $content = ob_get_clean();
+        ob_start();
+        $retval = include $input;
+        $content = ob_get_clean();
 
       // if an array is returned by the config file assume it's in plain php form else in YAML
       $input = is_array($retval) ? $retval : $content;
@@ -80,18 +79,18 @@ class sfYaml
 
     // if an array is returned by the config file assume it's in plain php form else in YAML
     if (is_array($input)) {
-      return $input;
+        return $input;
     }
 
-    $yaml = new sfYamlParser();
+      $yaml = new sfYamlParser();
 
-    try {
-      $ret = $yaml->parse($input);
-    } catch (Exception $e) {
-      throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
-    }
+      try {
+          $ret = $yaml->parse($input);
+      } catch (Exception $e) {
+          throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
+      }
 
-    return $ret;
+      return $ret;
   }
 
   /**
@@ -101,17 +100,17 @@ class sfYaml
    * to convert the array into friendly YAML.
    *
    * @param array   $array PHP array
-   * @param integer $inline The level where you switch to inline YAML
+   * @param int $inline The level where you switch to inline YAML
    *
    * @return string A YAML string representing the original PHP array
    */
   public static function dump($array, $inline = 2)
   {
-    require_once dirname(__FILE__).'/sfYamlDumper.php';
+      require_once dirname(__FILE__).'/sfYamlDumper.php';
 
-    $yaml = new sfYamlDumper();
+      $yaml = new sfYamlDumper();
 
-    return $yaml->dump($array, $inline);
+      return $yaml->dump($array, $inline);
   }
 }
 
@@ -122,5 +121,5 @@ class sfYaml
  */
 function echoln($string)
 {
-  echo $string."\n";
+    echo $string."\n";
 }
diff --git a/usr/share/wetddump/sfYamlDumper.class.php b/usr/share/wetddump/sfYamlDumper.class.php
index 3ce399b..f99919a 100644
--- a/usr/share/wetddump/sfYamlDumper.class.php
+++ b/usr/share/wetddump/sfYamlDumper.class.php
@@ -11,44 +11,43 @@
 /**
  * sfYamlDumper dumps PHP variables to YAML strings.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYamlDumper.class.php 10575 2008-08-01 13:08:42Z nicolas $
  */
 class sfYamlDumper
 {
-  /**
+    /**
    * Dumps a PHP value to YAML.
    *
    * @param  mixed   $input  The PHP value
-   * @param  integer $inline The level where you switch to inline YAML
-   * @param  integer $indent The level o indentation indentation (used internally)
+   * @param  int $inline The level where you switch to inline YAML
+   * @param  int $indent The level o indentation indentation (used internally)
    *
    * @return string  The YAML representation of the PHP value
    */
   public function dump($input, $inline = 0, $indent = 0)
   {
-    $output = '';
-    $prefix = $indent ? str_repeat(' ', $indent) : '';
+      $output = '';
+      $prefix = $indent ? str_repeat(' ', $indent) : '';
 
-    if ($inline <= 0 || !is_array($input) || empty($input)) {
-      $output .= $prefix.sfYamlInline::dump($input);
-    } else {
-      $isAHash = array_keys($input) !== range(0, count($input) - 1);
+      if ($inline <= 0 || !is_array($input) || empty($input)) {
+          $output .= $prefix.sfYamlInline::dump($input);
+      } else {
+          $isAHash = array_keys($input) !== range(0, count($input) - 1);
 
-      foreach ($input as $key => $value) {
-        $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+          foreach ($input as $key => $value) {
+              $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
 
-        $output .= sprintf('%s%s%s%s',
+              $output .= sprintf('%s%s%s%s',
           $prefix,
           $isAHash ? sfYamlInline::dump($key).':' : '-',
           $willBeInlined ? ' ' : "\n",
           $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
         ).($willBeInlined ? "\n" : '');
+          }
       }
-    }
 
-    return $output;
+      return $output;
   }
 }
diff --git a/usr/share/wetddump/sfYamlInline.class.php b/usr/share/wetddump/sfYamlInline.class.php
index 3bb1868..94b93ef 100644
--- a/usr/share/wetddump/sfYamlInline.class.php
+++ b/usr/share/wetddump/sfYamlInline.class.php
@@ -11,14 +11,13 @@
 /**
  * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYamlInline.class.php 16177 2009-03-11 08:32:48Z fabien $
  */
 class sfYamlInline
 {
-  const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
 
   /**
    * Convert a YAML string to a PHP array.
@@ -27,23 +26,20 @@ class sfYamlInline
    *
    * @return array A PHP array representing the YAML string
    */
-  static public function load($value)
+  public static function load($value)
   {
-    $value = trim($value);
+      $value = trim($value);
 
-    if (0 == strlen($value))
-    {
-      return '';
-    }
+      if (0 == strlen($value)) {
+          return '';
+      }
 
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
-    {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('ASCII');
-    }
+      if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+          $mbEncoding = mb_internal_encoding();
+          mb_internal_encoding('ASCII');
+      }
 
-    switch ($value[0])
-    {
+      switch ($value[0]) {
       case '[':
         $result = self::parseSequence($value);
         break;
@@ -54,12 +50,11 @@ class sfYamlInline
         $result = self::parseScalar($value);
     }
 
-    if (isset($mbEncoding))
-    {
-      mb_internal_encoding($mbEncoding);
-    }
+      if (isset($mbEncoding)) {
+          mb_internal_encoding($mbEncoding);
+      }
 
-    return $result;
+      return $result;
   }
 
   /**
@@ -69,21 +64,17 @@ class sfYamlInline
    *
    * @return string The YAML string representing the PHP array
    */
-  static public function dump($value)
+  public static function dump($value)
   {
-    if ('1.1' === sfYaml::getSpecVersion())
-    {
-      $trueValues = array('true', 'on', '+', 'yes', 'y');
-      $falseValues = array('false', 'off', '-', 'no', 'n');
-    }
-    else
-    {
-      $trueValues = array('true');
-      $falseValues = array('false');
-    }
+      if ('1.1' === sfYaml::getSpecVersion()) {
+          $trueValues = array('true', 'on', '+', 'yes', 'y');
+          $falseValues = array('false', 'off', '-', 'no', 'n');
+      } else {
+          $trueValues = array('true');
+          $falseValues = array('false');
+      }
 
-    switch (true)
-    {
+      switch (true) {
       case is_resource($value):
         throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
       case is_object($value):
@@ -126,32 +117,29 @@ class sfYamlInline
    *
    * @return string The YAML string representing the PHP array
    */
-  static protected function dumpArray($value)
+  protected static function dumpArray($value)
   {
-    // array
+      // array
     $keys = array_keys($value);
-    if (
+      if (
       (1 == count($keys) && '0' == $keys[0])
       ||
-      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
-    {
-      $output = array();
-      foreach ($value as $val)
-      {
-        $output[] = self::dump($val);
-      }
+      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2)) {
+          $output = array();
+          foreach ($value as $val) {
+              $output[] = self::dump($val);
+          }
 
-      return sprintf('[%s]', implode(', ', $output));
-    }
+          return sprintf('[%s]', implode(', ', $output));
+      }
 
     // mapping
     $output = array();
-    foreach ($value as $key => $val)
-    {
-      $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
-    }
+      foreach ($value as $key => $val) {
+          $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
+      }
 
-    return sprintf('{ %s }', implode(', ', $output));
+      return sprintf('{ %s }', implode(', ', $output));
   }
 
   /**
@@ -160,100 +148,85 @@ class sfYamlInline
    * @param scalar  $scalar
    * @param string  $delimiters
    * @param array   $stringDelimiter
-   * @param integer $i
-   * @param boolean $evaluate
+   * @param int $i
+   * @param bool $evaluate
    *
    * @return string A YAML string
    */
-  static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
+  public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
   {
-    if (in_array($scalar[$i], $stringDelimiters))
-    {
-      // quoted scalar
+      if (in_array($scalar[$i], $stringDelimiters)) {
+          // quoted scalar
       $output = self::parseQuotedScalar($scalar, $i);
-    }
-    else
-    {
-      // "normal" string
-      if (!$delimiters)
-      {
-        $output = substr($scalar, $i);
-        $i += strlen($output);
+      } else {
+          // "normal" string
+      if (!$delimiters) {
+          $output = substr($scalar, $i);
+          $i += strlen($output);
 
         // remove comments
-        if (false !== $strpos = strpos($output, ' #'))
-        {
-          $output = rtrim(substr($output, 0, $strpos));
+        if (false !== $strpos = strpos($output, ' #')) {
+            $output = rtrim(substr($output, 0, $strpos));
         }
-      }
-      else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match))
-      {
-        $output = $match[1];
-        $i += strlen($output);
-      }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
+      } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
+          $output = $match[1];
+          $i += strlen($output);
+      } else {
+          throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
       }
 
-      $output = $evaluate ? self::evaluateScalar($output) : $output;
-    }
+          $output = $evaluate ? self::evaluateScalar($output) : $output;
+      }
 
-    return $output;
+      return $output;
   }
 
   /**
    * Parses a quoted scalar to YAML.
    *
    * @param string  $scalar
-   * @param integer $i
+   * @param int $i
    *
    * @return string A YAML string
    */
-  static protected function parseQuotedScalar($scalar, &$i)
+  protected static function parseQuotedScalar($scalar, &$i)
   {
-    if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match))
-    {
-      throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
-    }
+      if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
+          throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
+      }
 
-    $output = substr($match[0], 1, strlen($match[0]) - 2);
+      $output = substr($match[0], 1, strlen($match[0]) - 2);
 
-    if ('"' == $scalar[$i])
-    {
-      // evaluate the string
+      if ('"' == $scalar[$i]) {
+          // evaluate the string
       $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
-    }
-    else
-    {
-      // unescape '
+      } else {
+          // unescape '
       $output = str_replace('\'\'', '\'', $output);
-    }
+      }
 
-    $i += strlen($match[0]);
+      $i += strlen($match[0]);
 
-    return $output;
+      return $output;
   }
 
   /**
    * Parses a sequence to a YAML string.
    *
    * @param string  $sequence
-   * @param integer $i
+   * @param int $i
    *
    * @return string A YAML string
    */
-  static protected function parseSequence($sequence, &$i = 0)
+  protected static function parseSequence($sequence, &$i = 0)
   {
-    $output = array();
-    $len = strlen($sequence);
-    $i += 1;
+      $output = array();
+      $len = strlen($sequence);
+      $i += 1;
 
     // [foo, bar, ...]
-    while ($i < $len)
-    {
-      switch ($sequence[$i])
-      {
+    while ($i < $len) {
+        switch ($sequence[$i]) {
         case '[':
           // nested sequence
           $output[] = self::parseSequence($sequence, $i);
@@ -271,16 +244,12 @@ class sfYamlInline
           $isQuoted = in_array($sequence[$i], array('"', "'"));
           $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
 
-          if (!$isQuoted && false !== strpos($value, ': '))
-          {
-            // embedded mapping?
-            try
-            {
-              $value = self::parseMapping('{'.$value.'}');
-            }
-            catch (InvalidArgumentException $e)
-            {
-              // no, it's not
+          if (!$isQuoted && false !== strpos($value, ': ')) {
+              // embedded mapping?
+            try {
+                $value = self::parseMapping('{'.$value.'}');
+            } catch (InvalidArgumentException $e) {
+                // no, it's not
             }
           }
 
@@ -289,31 +258,29 @@ class sfYamlInline
           --$i;
       }
 
-      ++$i;
+        ++$i;
     }
 
-    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
+      throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
   }
 
   /**
    * Parses a mapping to a YAML string.
    *
    * @param string  $mapping
-   * @param integer $i
+   * @param int $i
    *
    * @return string A YAML string
    */
-  static protected function parseMapping($mapping, &$i = 0)
+  protected static function parseMapping($mapping, &$i = 0)
   {
-    $output = array();
-    $len = strlen($mapping);
-    $i += 1;
+      $output = array();
+      $len = strlen($mapping);
+      $i += 1;
 
     // {foo: bar, bar:foo, ...}
-    while ($i < $len)
-    {
-      switch ($mapping[$i])
-      {
+    while ($i < $len) {
+        switch ($mapping[$i]) {
         case ' ':
         case ',':
           ++$i;
@@ -327,10 +294,8 @@ class sfYamlInline
 
       // value
       $done = false;
-      while ($i < $len)
-      {
-        switch ($mapping[$i])
-        {
+        while ($i < $len) {
+            switch ($mapping[$i]) {
           case '[':
             // nested sequence
             $output[$key] = self::parseSequence($mapping, $i);
@@ -350,16 +315,15 @@ class sfYamlInline
             --$i;
         }
 
-        ++$i;
+            ++$i;
 
-        if ($done)
-        {
-          continue 2;
+            if ($done) {
+                continue 2;
+            }
         }
-      }
     }
 
-    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
+      throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
   }
 
   /**
@@ -369,23 +333,19 @@ class sfYamlInline
    *
    * @return string A YAML string
    */
-  static protected function evaluateScalar($scalar)
+  protected static function evaluateScalar($scalar)
   {
-    $scalar = trim($scalar);
+      $scalar = trim($scalar);
 
-    if ('1.1' === sfYaml::getSpecVersion())
-    {
-      $trueValues = array('true', 'on', '+', 'yes', 'y');
-      $falseValues = array('false', 'off', '-', 'no', 'n');
-    }
-    else
-    {
-      $trueValues = array('true');
-      $falseValues = array('false');
-    }
+      if ('1.1' === sfYaml::getSpecVersion()) {
+          $trueValues = array('true', 'on', '+', 'yes', 'y');
+          $falseValues = array('false', 'off', '-', 'no', 'n');
+      } else {
+          $trueValues = array('true');
+          $falseValues = array('false');
+      }
 
-    switch (true)
-    {
+      switch (true) {
       case 'null' == strtolower($scalar):
       case '' == $scalar:
       case '~' == $scalar:
@@ -399,6 +359,7 @@ class sfYamlInline
       case ctype_digit($scalar):
         $raw = $scalar;
         $cast = intval($scalar);
+
         return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
       case in_array(strtolower($scalar), $trueValues):
         return true;
@@ -420,9 +381,9 @@ class sfYamlInline
     }
   }
 
-  static protected function getTimestampRegex()
-  {
-    return <<<EOF
+    protected static function getTimestampRegex()
+    {
+        return <<<EOF
     ~^
     (?P<year>[0-9][0-9][0-9][0-9])
     -(?P<month>[0-9][0-9]?)
@@ -436,5 +397,5 @@ class sfYamlInline
     (?::(?P<tz_minute>[0-9][0-9]))?))?)?
     $~x
 EOF;
-  }
+    }
 }
diff --git a/usr/share/wetddump/sfYamlParser.class.php b/usr/share/wetddump/sfYamlParser.class.php
index 820de59..d7d4219 100644
--- a/usr/share/wetddump/sfYamlParser.class.php
+++ b/usr/share/wetddump/sfYamlParser.class.php
@@ -8,36 +8,33 @@
  * file that was distributed with this source code.
  */
 
-if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
-{
-  define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
+if (!defined('PREG_BAD_UTF8_OFFSET_ERROR')) {
+    define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
 }
 
 /**
  * sfYamlParser parses YAML strings to convert them to PHP arrays.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYamlParser.class.php 10832 2008-08-13 07:46:08Z fabien $
  */
 class sfYamlParser
 {
-  protected
-    $offset        = 0,
-    $lines         = array(),
+    protected $offset = 0,
+    $lines = array(),
     $currentLineNb = -1,
-    $currentLine   = '',
-    $refs          = array();
+    $currentLine = '',
+    $refs = array();
 
   /**
-   * Constructor
+   * Constructor.
    *
-   * @param integer $offset The offset of YAML document (used for line numbers in error messages)
+   * @param int $offset The offset of YAML document (used for line numbers in error messages)
    */
   public function __construct($offset = 0)
   {
-    $this->offset = $offset;
+      $this->offset = $offset;
   }
 
   /**
@@ -51,196 +48,146 @@ class sfYamlParser
    */
   public function parse($value)
   {
-    $this->currentLineNb = -1;
-    $this->currentLine = '';
-    $this->lines = explode("\n", $this->cleanup($value));
+      $this->currentLineNb = -1;
+      $this->currentLine = '';
+      $this->lines = explode("\n", $this->cleanup($value));
 
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
-    {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('UTF-8');
-    }
-
-    $data = array();
-    while ($this->moveToNextLine())
-    {
-      if ($this->isCurrentLineEmpty())
-      {
-        continue;
+      if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+          $mbEncoding = mb_internal_encoding();
+          mb_internal_encoding('UTF-8');
       }
 
+      $data = array();
+      while ($this->moveToNextLine()) {
+          if ($this->isCurrentLineEmpty()) {
+              continue;
+          }
+
       // tab?
-      if (preg_match('#^\t+#', $this->currentLine))
-      {
-        throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      if (preg_match('#^\t+#', $this->currentLine)) {
+          throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
       }
 
-      $isRef = $isInPlace = $isProcessed = false;
-      if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
-      {
-        if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
-        {
-          $isRef = $matches['ref'];
-          $values['value'] = $matches['value'];
-        }
+          $isRef = $isInPlace = $isProcessed = false;
+          if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+              if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                  $isRef = $matches['ref'];
+                  $values['value'] = $matches['value'];
+              }
 
         // array
-        if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
-        {
-          $c = $this->getRealCurrentLineNb() + 1;
-          $parser = new sfYamlParser($c);
-          $parser->refs =& $this->refs;
-          $data[] = $parser->parse($this->getNextEmbedBlock());
-        }
-        else
-        {
-          if (isset($values['leadspaces'])
+        if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+            $c = $this->getRealCurrentLineNb() + 1;
+            $parser = new self($c);
+            $parser->refs = &$this->refs;
+            $data[] = $parser->parse($this->getNextEmbedBlock());
+        } else {
+            if (isset($values['leadspaces'])
             && ' ' == $values['leadspaces']
-            && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches))
-          {
-            // this is a compact notation element, add to next block and parse
+            && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)) {
+                // this is a compact notation element, add to next block and parse
             $c = $this->getRealCurrentLineNb();
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
+                $parser = new self($c);
+                $parser->refs = &$this->refs;
 
-            $block = $values['value'];
-            if (!$this->isNextLineIndented())
-            {
-              $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
-            }
-
-            $data[] = $parser->parse($block);
-          }
-          else
-          {
-            $data[] = $this->parseValue($values['value']);
-          }
-        }
-      }
-      else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
-      {
-        $key = sfYamlInline::parseScalar($values['key']);
-
-        if ('<<' === $key)
-        {
-          if (isset($values['value']) && '*' === substr($values['value'], 0, 1))
-          {
-            $isInPlace = substr($values['value'], 1);
-            if (!array_key_exists($isInPlace, $this->refs))
-            {
-              throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
-            }
-          }
-          else
-          {
-            if (isset($values['value']) && $values['value'] !== '')
-            {
-              $value = $values['value'];
-            }
-            else
-            {
-              $value = $this->getNextEmbedBlock();
-            }
-            $c = $this->getRealCurrentLineNb() + 1;
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
-            $parsed = $parser->parse($value);
-
-            $merged = array();
-            if (!is_array($parsed))
-            {
-              throw new InvalidArgumentException(sprintf("YAML merge keys used with a scalar value instead of an array at line %s (%s)", $this->getRealCurrentLineNb() + 1, $this->currentLine));
-            }
-            else if (isset($parsed[0]))
-            {
-              // Numeric array, merge individual elements
-              foreach (array_reverse($parsed) as $parsedItem)
-              {
-                if (!is_array($parsedItem))
-                {
-                  throw new InvalidArgumentException(sprintf("Merge items must be arrays at line %s (%s).", $this->getRealCurrentLineNb() + 1, $parsedItem));
+                $block = $values['value'];
+                if (!$this->isNextLineIndented()) {
+                    $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
                 }
-                $merged = array_merge($parsedItem, $merged);
-              }
+
+                $data[] = $parser->parse($block);
+            } else {
+                $data[] = $this->parseValue($values['value']);
             }
-            else
-            {
-              // Associative array, merge
+        }
+          } elseif (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+              $key = sfYamlInline::parseScalar($values['key']);
+
+              if ('<<' === $key) {
+                  if (isset($values['value']) && '*' === substr($values['value'], 0, 1)) {
+                      $isInPlace = substr($values['value'], 1);
+                      if (!array_key_exists($isInPlace, $this->refs)) {
+                          throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                      }
+                  } else {
+                      if (isset($values['value']) && $values['value'] !== '') {
+                          $value = $values['value'];
+                      } else {
+                          $value = $this->getNextEmbedBlock();
+                      }
+                      $c = $this->getRealCurrentLineNb() + 1;
+                      $parser = new self($c);
+                      $parser->refs = &$this->refs;
+                      $parsed = $parser->parse($value);
+
+                      $merged = array();
+                      if (!is_array($parsed)) {
+                          throw new InvalidArgumentException(sprintf('YAML merge keys used with a scalar value instead of an array at line %s (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                      } elseif (isset($parsed[0])) {
+                          // Numeric array, merge individual elements
+              foreach (array_reverse($parsed) as $parsedItem) {
+                  if (!is_array($parsedItem)) {
+                      throw new InvalidArgumentException(sprintf('Merge items must be arrays at line %s (%s).', $this->getRealCurrentLineNb() + 1, $parsedItem));
+                  }
+                  $merged = array_merge($parsedItem, $merged);
+              }
+                      } else {
+                          // Associative array, merge
               $merged = array_merge($merged, $parsed);
-            }
+                      }
 
-            $isProcessed = $merged;
-          }
-        }
-        else if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
-        {
-          $isRef = $matches['ref'];
-          $values['value'] = $matches['value'];
-        }
-
-        if ($isProcessed)
-        {
-          // Merge keys
-          $data = $isProcessed;
-        }
-        // hash
-        else if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
-        {
-          // if next line is less indented or equal, then it means that the current value is null
-          if ($this->isNextLineIndented())
-          {
-            $data[$key] = null;
-          }
-          else
-          {
-            $c = $this->getRealCurrentLineNb() + 1;
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
-            $data[$key] = $parser->parse($this->getNextEmbedBlock());
-          }
-        }
-        else
-        {
-          if ($isInPlace)
-          {
-            $data = $this->refs[$isInPlace];
-          }
-          else
-          {
-            $data[$key] = $this->parseValue($values['value']);
-          }
-        }
-      }
-      else
-      {
-        // 1-liner followed by newline
-        if (2 == count($this->lines) && empty($this->lines[1]))
-        {
-          $value = sfYamlInline::load($this->lines[0]);
-          if (is_array($value))
-          {
-            $first = reset($value);
-            if ('*' === substr($first, 0, 1))
-            {
-              $data = array();
-              foreach ($value as $alias)
-              {
-                $data[] = $this->refs[substr($alias, 1)];
+                      $isProcessed = $merged;
+                  }
+              } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                  $isRef = $matches['ref'];
+                  $values['value'] = $matches['value'];
               }
-              $value = $data;
+
+              if ($isProcessed) {
+                  // Merge keys
+          $data = $isProcessed;
+              }
+        // hash
+        elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+            // if next line is less indented or equal, then it means that the current value is null
+          if ($this->isNextLineIndented()) {
+              $data[$key] = null;
+          } else {
+              $c = $this->getRealCurrentLineNb() + 1;
+              $parser = new self($c);
+              $parser->refs = &$this->refs;
+              $data[$key] = $parser->parse($this->getNextEmbedBlock());
+          }
+        } else {
+            if ($isInPlace) {
+                $data = $this->refs[$isInPlace];
+            } else {
+                $data[$key] = $this->parseValue($values['value']);
+            }
+        }
+          } else {
+              // 1-liner followed by newline
+        if (2 == count($this->lines) && empty($this->lines[1])) {
+            $value = sfYamlInline::load($this->lines[0]);
+            if (is_array($value)) {
+                $first = reset($value);
+                if ('*' === substr($first, 0, 1)) {
+                    $data = array();
+                    foreach ($value as $alias) {
+                        $data[] = $this->refs[substr($alias, 1)];
+                    }
+                    $value = $data;
+                }
             }
-          }
 
-          if (isset($mbEncoding))
-          {
-            mb_internal_encoding($mbEncoding);
-          }
+            if (isset($mbEncoding)) {
+                mb_internal_encoding($mbEncoding);
+            }
 
-          return $value;
+            return $value;
         }
 
-        switch (preg_last_error())
-        {
+              switch (preg_last_error()) {
           case PREG_INTERNAL_ERROR:
             $error = 'Internal PCRE error on line';
             break;
@@ -260,106 +207,90 @@ class sfYamlParser
             $error = 'Unable to parse line';
         }
 
-        throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+              throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+          }
+
+          if ($isRef) {
+              $this->refs[$isRef] = end($data);
+          }
       }
 
-      if ($isRef)
-      {
-        $this->refs[$isRef] = end($data);
+      if (isset($mbEncoding)) {
+          mb_internal_encoding($mbEncoding);
       }
-    }
 
-    if (isset($mbEncoding))
-    {
-      mb_internal_encoding($mbEncoding);
-    }
-
-    return empty($data) ? null : $data;
+      return empty($data) ? null : $data;
   }
 
   /**
    * Returns the current line number (takes the offset into account).
    *
-   * @return integer The current line number
+   * @return int The current line number
    */
   protected function getRealCurrentLineNb()
   {
-    return $this->currentLineNb + $this->offset;
+      return $this->currentLineNb + $this->offset;
   }
 
   /**
    * Returns the current line indentation.
    *
-   * @return integer The current line indentation
+   * @return int The current line indentation
    */
   protected function getCurrentLineIndentation()
   {
-    return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
+      return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
   }
 
   /**
    * Returns the next embed block of YAML.
    *
-   * @param integer $indentation The indent level at which the block is to be read, or null for default
+   * @param int $indentation The indent level at which the block is to be read, or null for default
    *
    * @return string A YAML string
    */
   protected function getNextEmbedBlock($indentation = null)
   {
-    $this->moveToNextLine();
+      $this->moveToNextLine();
 
-    if (null === $indentation)
-    {
-      $newIndent = $this->getCurrentLineIndentation();
+      if (null === $indentation) {
+          $newIndent = $this->getCurrentLineIndentation();
 
-      if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
-      {
-        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-    }
-    else
-    {
-      $newIndent = $indentation;
-    }
-
-    $data = array(substr($this->currentLine, $newIndent));
-
-    while ($this->moveToNextLine())
-    {
-      if ($this->isCurrentLineEmpty())
-      {
-        if ($this->isCurrentLineBlank())
-        {
-          $data[] = substr($this->currentLine, $newIndent);
-        }
-
-        continue;
+          if (!$this->isCurrentLineEmpty() && 0 == $newIndent) {
+              throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+          }
+      } else {
+          $newIndent = $indentation;
       }
 
-      $indent = $this->getCurrentLineIndentation();
+      $data = array(substr($this->currentLine, $newIndent));
 
-      if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match))
-      {
-        // empty line
+      while ($this->moveToNextLine()) {
+          if ($this->isCurrentLineEmpty()) {
+              if ($this->isCurrentLineBlank()) {
+                  $data[] = substr($this->currentLine, $newIndent);
+              }
+
+              continue;
+          }
+
+          $indent = $this->getCurrentLineIndentation();
+
+          if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match)) {
+              // empty line
         $data[] = $match['text'];
-      }
-      else if ($indent >= $newIndent)
-      {
-        $data[] = substr($this->currentLine, $newIndent);
-      }
-      else if (0 == $indent)
-      {
-        $this->moveToPreviousLine();
+          } elseif ($indent >= $newIndent) {
+              $data[] = substr($this->currentLine, $newIndent);
+          } elseif (0 == $indent) {
+              $this->moveToPreviousLine();
 
-        break;
+              break;
+          } else {
+              throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+          }
       }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-    }
 
-    return implode("\n", $data);
+      return implode("\n", $data);
   }
 
   /**
@@ -367,14 +298,13 @@ class sfYamlParser
    */
   protected function moveToNextLine()
   {
-    if ($this->currentLineNb >= count($this->lines) - 1)
-    {
-      return false;
-    }
+      if ($this->currentLineNb >= count($this->lines) - 1) {
+          return false;
+      }
 
-    $this->currentLine = $this->lines[++$this->currentLineNb];
+      $this->currentLine = $this->lines[++$this->currentLineNb];
 
-    return true;
+      return true;
   }
 
   /**
@@ -382,7 +312,7 @@ class sfYamlParser
    */
   protected function moveToPreviousLine()
   {
-    $this->currentLine = $this->lines[--$this->currentLineNb];
+      $this->currentLine = $this->lines[--$this->currentLineNb];
   }
 
   /**
@@ -394,34 +324,27 @@ class sfYamlParser
    */
   protected function parseValue($value)
   {
-    if ('*' === substr($value, 0, 1))
-    {
-      if (false !== $pos = strpos($value, '#'))
-      {
-        $value = substr($value, 1, $pos - 2);
-      }
-      else
-      {
-        $value = substr($value, 1);
+      if ('*' === substr($value, 0, 1)) {
+          if (false !== $pos = strpos($value, '#')) {
+              $value = substr($value, 1, $pos - 2);
+          } else {
+              $value = substr($value, 1);
+          }
+
+          if (!array_key_exists($value, $this->refs)) {
+              throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
+          }
+
+          return $this->refs[$value];
       }
 
-      if (!array_key_exists($value, $this->refs))
-      {
-        throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
+      if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches)) {
+          $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
+
+          return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers)));
+      } else {
+          return sfYamlInline::load($value);
       }
-      return $this->refs[$value];
-    }
-
-    if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches))
-    {
-      $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
-
-      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers)));
-    }
-    else
-    {
-      return sfYamlInline::load($value);
-    }
   }
 
   /**
@@ -429,74 +352,62 @@ class sfYamlParser
    *
    * @param  string  $separator   The separator that was used to begin this folded scalar (| or >)
    * @param  string  $indicator   The indicator that was used to begin this folded scalar (+ or -)
-   * @param  integer $indentation The indentation that was used to begin this folded scalar
+   * @param  int $indentation The indentation that was used to begin this folded scalar
    *
    * @return string  The text value
    */
   protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
   {
-    $separator = '|' == $separator ? "\n" : ' ';
-    $text = '';
-
-    $notEOF = $this->moveToNextLine();
-
-    while ($notEOF && $this->isCurrentLineBlank())
-    {
-      $text .= "\n";
+      $separator = '|' == $separator ? "\n" : ' ';
+      $text = '';
 
       $notEOF = $this->moveToNextLine();
-    }
 
-    if (!$notEOF)
-    {
-      return '';
-    }
+      while ($notEOF && $this->isCurrentLineBlank()) {
+          $text .= "\n";
 
-    if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches))
-    {
-      $this->moveToPreviousLine();
-
-      return '';
-    }
-
-    $textIndent = $matches['indent'];
-    $previousIndent = 0;
-
-    $text .= $matches['text'].$separator;
-    while ($this->currentLineNb + 1 < count($this->lines))
-    {
-      $this->moveToNextLine();
-
-      if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches))
-      {
-        if (' ' == $separator && $previousIndent != $matches['indent'])
-        {
-          $text = substr($text, 0, -1)."\n";
-        }
-        $previousIndent = $matches['indent'];
-
-        $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
+          $notEOF = $this->moveToNextLine();
       }
-      else if (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches))
-      {
-        $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
-      }
-      else
-      {
-        $this->moveToPreviousLine();
 
-        break;
+      if (!$notEOF) {
+          return '';
       }
-    }
 
-    if (' ' == $separator)
-    {
-      // replace last separator by a newline
+      if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches)) {
+          $this->moveToPreviousLine();
+
+          return '';
+      }
+
+      $textIndent = $matches['indent'];
+      $previousIndent = 0;
+
+      $text .= $matches['text'].$separator;
+      while ($this->currentLineNb + 1 < count($this->lines)) {
+          $this->moveToNextLine();
+
+          if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches)) {
+              if (' ' == $separator && $previousIndent != $matches['indent']) {
+                  $text = substr($text, 0, -1)."\n";
+              }
+              $previousIndent = $matches['indent'];
+
+              $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
+          } elseif (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches)) {
+              $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
+          } else {
+              $this->moveToPreviousLine();
+
+              break;
+          }
+      }
+
+      if (' ' == $separator) {
+          // replace last separator by a newline
       $text = preg_replace('/ (\n*)$/', "\n$1", $text);
-    }
+      }
 
-    switch ($indicator)
-    {
+      switch ($indicator) {
       case '':
         $text = preg_replace('#\n+$#s', "\n", $text);
         break;
@@ -507,70 +418,68 @@ class sfYamlParser
         break;
     }
 
-    return $text;
+      return $text;
   }
 
   /**
    * Returns true if the next line is indented.
    *
-   * @return Boolean Returns true if the next line is indented, false otherwise
+   * @return bool Returns true if the next line is indented, false otherwise
    */
   protected function isNextLineIndented()
   {
-    $currentIndentation = $this->getCurrentLineIndentation();
-    $notEOF = $this->moveToNextLine();
-
-    while ($notEOF && $this->isCurrentLineEmpty())
-    {
+      $currentIndentation = $this->getCurrentLineIndentation();
       $notEOF = $this->moveToNextLine();
-    }
 
-    if (false === $notEOF)
-    {
-      return false;
-    }
+      while ($notEOF && $this->isCurrentLineEmpty()) {
+          $notEOF = $this->moveToNextLine();
+      }
 
-    $ret = false;
-    if ($this->getCurrentLineIndentation() <= $currentIndentation)
-    {
-      $ret = true;
-    }
+      if (false === $notEOF) {
+          return false;
+      }
 
-    $this->moveToPreviousLine();
+      $ret = false;
+      if ($this->getCurrentLineIndentation() <= $currentIndentation) {
+          $ret = true;
+      }
 
-    return $ret;
+      $this->moveToPreviousLine();
+
+      return $ret;
   }
 
   /**
    * Returns true if the current line is blank or if it is a comment line.
    *
-   * @return Boolean Returns true if the current line is empty or if it is a comment line, false otherwise
+   * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
    */
   protected function isCurrentLineEmpty()
   {
-    return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
+      return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
   }
 
   /**
    * Returns true if the current line is blank.
    *
-   * @return Boolean Returns true if the current line is blank, false otherwise
+   * @return bool Returns true if the current line is blank, false otherwise
    */
   protected function isCurrentLineBlank()
   {
-    return '' == trim($this->currentLine, ' ');
+      return '' == trim($this->currentLine, ' ');
   }
 
   /**
    * Returns true if the current line is a comment line.
    *
-   * @return Boolean Returns true if the current line is a comment line, false otherwise
+   * @return bool Returns true if the current line is a comment line, false otherwise
    */
   protected function isCurrentLineComment()
   {
-    //checking explicitly the first char of the trim is faster than loops or strpos
+      //checking explicitly the first char of the trim is faster than loops or strpos
     $ltrimmedLine = ltrim($this->currentLine, ' ');
-    return $ltrimmedLine[0] === '#';
+
+      return $ltrimmedLine[0] === '#';
   }
 
   /**
@@ -582,39 +491,36 @@ class sfYamlParser
    */
   protected function cleanup($value)
   {
-    $value = str_replace(array("\r\n", "\r"), "\n", $value);
+      $value = str_replace(array("\r\n", "\r"), "\n", $value);
 
-    if (!preg_match("#\n$#", $value))
-    {
-      $value .= "\n";
-    }
+      if (!preg_match("#\n$#", $value)) {
+          $value .= "\n";
+      }
 
     // strip YAML header
     $count = 0;
-    $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
-    $this->offset += $count;
+      $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
+      $this->offset += $count;
 
     // remove leading comments
     $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-    if ($count == 1)
-    {
-      // items have been removed, update the offset
+      if ($count == 1) {
+          // items have been removed, update the offset
       $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-      $value = $trimmedValue;
-    }
+          $value = $trimmedValue;
+      }
 
     // remove start of the document marker (---)
     $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-    if ($count == 1)
-    {
-      // items have been removed, update the offset
+      if ($count == 1) {
+          // items have been removed, update the offset
       $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-      $value = $trimmedValue;
+          $value = $trimmedValue;
 
       // remove end of the document marker (...)
       $value = preg_replace('#\.\.\.\s*$#s', '', $value);
-    }
+      }
 
-    return $value;
+      return $value;
   }
 }
diff --git a/var/log/wetddump/mongodb.log b/var/log/wetddump/mongodb.log
new file mode 100644
index 0000000..e69de29