Changeset 4744

Timestamp:

08/07/08 16:03:54 (5 months ago)

Author:

jwage

Message:

fixes #1112

Location:

branches/1.0/lib/Doctrine/Parser

Files:

• sfYaml (added)
• sfYaml.php (added)
• sfYaml/Dumper.php (added)
• sfYaml/Inline.php (added)
• sfYaml/Parser.php (added)
• Yml.php (modified) (5 diffs)

branches/1.0/lib/Doctrine/Parser/Yml.php

@@ -29 +29 @@
  * @since       1.0
  * @version     $Revision: 1080 $
- * @author      Jonathan H. Wage <jwage@mac.com>
+ * @author      Jonathan H. Wage <jwage@mac.com>, Thomas Courbon <harthie@yahoo.fr>
  */
 class Doctrine_Parser_Yml extends Doctrine_Parser
@@ -38 +38 @@
      * Dump an array of data to a specified path or return
      * 
+     * @throws Doctrine_Parser_Exception dumping error
      * @param  string $array Array of data to dump to yaml
      * @param  string $path  Path to dump the yaml to
@@ -45 +46 @@
     public function dumpData($array, $path = null)
     {
-        $spyc = new Doctrine_Parser_Spyc();
-        
-        $data = $spyc->dump($array, false, false);
-        
-        return $this->doDump($data, $path);
+       
+        try {
+          $data = Doctrine_Parser_sfYaml::dump($array);
+          
+          return $this->doDump($data, $path);
+          
+        } catch(InvalidArgumentException $e) {
+          // rethrow the exceptions
+          $rethrowed_exception = new Doctrine_Parser_Exception($e->getMessage(), $e->getCode());
+          
+          throw $rethrowed_exception;
+        }
     }
 
@@ -57 +65 @@
      * Load and parse data from a yml file
      * 
+     * @throws Doctrine_Parser_Exception parsing error
      * @param  string  $path  Path to load yaml data from
      * @return array   $array Array of parsed yaml data
@@ -62 +71 @@
     public function loadData($path)
     {
-        $contents = $this->doLoad($path);
+        try {
+          /*
+           * I still use the doLoad method even if sfYaml can load yml from a file
+           * since this way Doctrine can handle file on it own.
+           */ 
+          $contents = $this->doLoad($path);
 
-        $spyc = new Doctrine_Parser_Spyc();
-        
-        $array = $spyc->load($contents);
-        
-        return $array;
-    }
+          $array = Doctrine_Parser_sfYaml::load($contents);
+          
+          return $array;
+          
+        } catch(InvalidArgumentException $e) {
+          // rethrow the exceptions
+          $rethrowed_exception = new Doctrine_Parser_Exception($e->getMessage(), $e->getCode());
+          
+          throw $rethrowed_exception;
+        }
+    }        
 }