Fixed uniqueness of fields - closing #25

elgentos · Oct 3, 2018 · 2cff18e · 2cff18e
1 parent 1be7bdd
commit 2cff18e
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/src/Elgentos/Masquerade/Console/RunCommand.php b/src/Elgentos/Masquerade/Console/RunCommand.php
@@ -63,6 +63,11 @@ class RunCommand extends Command
      */
     protected $configHelper;
 
+    /**
+     * @var array
+     */
+    protected $fakerInstanceCache;
+
     /**
      *
      */
@@ -169,7 +174,14 @@ private function fakeData(array $table) : void
                     }
 
                     try {
-                        $updates[$columnName] = $this->getFakerInstance($columnData, $providerClassName)->{$formatter}(...$options);
+                        $fakerInstance = $this->getFakerInstance($columnData, $providerClassName);
+                        if (array_get($columnData, 'unique', false)) {
+                            $updates[$columnName] = $fakerInstance->unique()->{$formatter}(...$options);
+                        } elseif(array_get($columnData, 'optional', false)) {
+                            $updates[$columnName] = $fakerInstance->optional()->{$formatter}(...$options);
+                        } else {
+                            $updates[$columnName] = $fakerInstance->{$formatter}(...$options);
+                        }
                     } catch (\InvalidArgumentException $e) {
                         // If InvalidArgumentException is thrown, formatter is not found, use null instead
                         $updates[$columnName] = null;
@@ -252,6 +264,11 @@ private function setup()
      */
     private function getFakerInstance(array $columnData, $providerClassName = false) : Generator
     {
+        $key = md5(serialize($columnData) . $providerClassName);
+        if (isset($this->fakerInstanceCache[$key])) {
+            return $this->fakerInstanceCache[$key];
+        }
+
         $fakerInstance = FakerFactory::create($this->locale);
 
         $provider = false;
@@ -266,15 +283,7 @@ private function getFakerInstance(array $columnData, $providerClassName = false)
             $fakerInstance->addProvider($provider);
         }
 
-        if (array_get($columnData, 'unique', false)) {
-            $fakerInstance->unique();
-        }
-        if (array_get($columnData, 'optional', false)) {
-            $fakerInstance->optional();
-        }
-        if (array_get($columnData, 'valid', false)) {
-            $fakerInstance->valid();
-        }
+        $this->fakerInstanceCache[$key] = $fakerInstance;
 
         return $fakerInstance;
     }