From 2fe7b95fba73120e5d84a833230e2323496892e7 Mon Sep 17 00:00:00 2001
From: "Jonathan.Wage" <Jonathan.Wage@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 20 Sep 2007 19:30:19 +0000
Subject: [PATCH] Changes static methods to be normal public methods.

---
 lib/Doctrine/Data.php                |  6 +++---
 manual/new/docs/en/data-fixtures.txt | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/Data.php b/lib/Doctrine/Data.php
index 29c78a664..aa8519875 100644
--- a/lib/Doctrine/Data.php
+++ b/lib/Doctrine/Data.php
@@ -185,7 +185,7 @@ class Doctrine_Data
      * @return void
      * @author Jonathan H. Wage
      */
-    public static function exportData($directory, $format = 'yml', $models = array(), $exportIndividualFiles = false)
+    public function exportData($directory, $format = 'yml', $models = array(), $exportIndividualFiles = false)
     {
         $export = new Doctrine_Data_Export($directory);
         $export->setFormat($format);
@@ -205,7 +205,7 @@ class Doctrine_Data
      * @return void
      * @author Jonathan H. Wage
      */
-    public static function importData($directory, $format = 'yml', $models = array())
+    public function importData($directory, $format = 'yml', $models = array())
     {
         $import = new Doctrine_Data_Import($directory);
         $import->setFormat($format);
@@ -223,7 +223,7 @@ class Doctrine_Data
      * @return void
      * @author Jonathan H. Wage
      */
-    public static function importDummyData($num = 3, $models = array())
+    public function importDummyData($num = 3, $models = array())
     {
         $import = new Doctrine_Data_Import();
         $import->setModels($models);
diff --git a/manual/new/docs/en/data-fixtures.txt b/manual/new/docs/en/data-fixtures.txt
index d24749e26..44952d3a1 100644
--- a/manual/new/docs/en/data-fixtures.txt
+++ b/manual/new/docs/en/data-fixtures.txt
@@ -8,10 +8,12 @@ You can export data to fixtures file in many different formats
 // A few ways exist for specifying where you export the data
 
 // Dump to one large fixture file
-Doctrine_Data::exportData('data.yml', 'yml');
+$data = new Doctrine_Data();
+$data->exportData('data.yml', 'yml');
 
 // Dump to individual files. One file per model. 3rd argument true specifies to dump to individual files
-Doctrine_Data::exportData('path/to/directory', 'yml', true);
+$data = new Doctrine_Data();
+$data->exportData('path/to/directory', 'yml', true);
 </code>
 
 ++ Importing
@@ -31,7 +33,8 @@ $format = 'csv';
 
 $models = array('User', 'Phonenumber'); // you can optionally specify an array of the models you wish to import the data for, by default it loads data for all the available loaded models and the data that exists
 
-Doctrine_Data::importData($path, $format, $models);
+$data = new Doctrine_Data();
+$data->importData($path, $format, $models);
 </code>
 
 ++ Dummy Data
@@ -42,7 +45,8 @@ With Doctrine Data you can import dummy data to all your Doctrine Records
 $numRecords = 3; // Number of dummy records to populate for each model
 $models = array('User', 'Email'); // Models to generate dummy data for. If none specified it generates dummy data for all loaded models.
 
-Doctrine_Data::importDummyData($numRecords, $models);
+$data = new Doctrine_Data();
+$data->importDummyData($numRecords, $models);
 </code>
 
 ++ Writing
@@ -76,5 +80,6 @@ Phonenumber:
 Here is how you would write code to load the data from that data.yml file
 
 <code type="php">
-Doctrine_Data::importData('data.yml', 'yml');
+$data = new Doctrine_Data();
+$data->importData('data.yml', 'yml');
 </code>
\ No newline at end of file