fix config xml format and unique retry max number

spyrit · Feb 25, 2013 · 40015b3 · 40015b3
1 parent 54705b6
commit 40015b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Spyrit/Datalea/Faker/Dump/Dumper.php b/src/Spyrit/Datalea/Faker/Dump/Dumper.php
@@ -96,7 +96,7 @@ public function saveConfigAsXML($dir)
     {
         $name = $this->config->getClassName(true).'_datalea_config';
 
-        $root = new CdataSimpleXMLElement('<?xml version=\'1.0\' encoding=\'utf-8\'?><dataleaConfig/>');
+        $root = new CdataSimpleXMLElement('<?xml version=\'1.0\' encoding=\'utf-8\'?><datalea/>');
 
         $root->addAttribute('classname', $this->config->getClassName());
         $root->addAttribute('locale', $this->config->getLocale());
@@ -384,11 +384,13 @@ public function dumpJSON($dir)
 JSON;
         $name = $this->config->getClassName(true);
 
+        $fakeData = $this->getFakeData();
+
         $file = $dir.DS.$name.'.json';
         if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            $json = json_encode($this->getFakeData(), JSON_PRETTY_PRINT);
+            $json = json_encode($fakeData, JSON_PRETTY_PRINT);
         } else {
-            $json = json_encode($this->getFakeData());
+            $json = json_encode($fakeData);
         }
         file_put_contents($file, $json);
 

diff --git a/src/Spyrit/Datalea/Faker/Dump/Loader.php b/src/Spyrit/Datalea/Faker/Dump/Loader.php
@@ -69,13 +69,12 @@ public function loadXmlFakerConfig($file)
             foreach ($root->columns->column as $column) {
                 $columnConfig = new ColumnConfig();
                 $columnConfig->setName($column['name']);
-                $columnConfig->setUnique($column['unique']);
+                $columnConfig->setUnique(!empty($column['unique']));
                 $columnConfig->setValue((string) $column->value);
                 $columnConfig->setConvertMethod((string) $column->convert);
                 $config->addColumnConfig($columnConfig);
             }
         }
-
         return $config;
     }
 }
diff --git a/src/Spyrit/Datalea/Faker/Model/ColumnConfig.php b/src/Spyrit/Datalea/Faker/Model/ColumnConfig.php
@@ -196,7 +196,7 @@ public function generateValues(\Faker\Generator $faker, array &$values, array $v
 
                 $column = implode('-', $columnValues);
                 $try++;
-                if ($try > 10) {
+                if ($try > 4) {
                     $inc++;
                     $column = is_numeric($column) ? $column+1 : $column.'_'.$inc;
                 }