From c86207aeda167eb4f61802e693e921a5b33eb533 Mon Sep 17 00:00:00 2001
From: RedLucas <RedLucas@users.noreply.github.com>
Date: Tue, 6 Jun 2017 13:25:09 -0700
Subject: [PATCH 1/2] Allow Arrays to be passed as parameter when needed

---
 src/PatternLab/Faker/PatternLabListener.php | 45 ++++++++++++---------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/PatternLab/Faker/PatternLabListener.php b/src/PatternLab/Faker/PatternLabListener.php
index 8250100..046db5b 100644
--- a/src/PatternLab/Faker/PatternLabListener.php
+++ b/src/PatternLab/Faker/PatternLabListener.php
@@ -104,13 +104,15 @@ public function fakeContent() {
   */
   public function formatOptionsAndFake($formatter, $options) {
     
-    if (($formatter == "date") || ($formatter == "time")) {
-      
+    if (in_array($formatter, ["randomElements", "randomElement", "shuffle", "date", "time"])) {
       // don't try to parse date or time options. cross our fingers
+      // Also if the 
+      if ($formatter == "date" || $formatter == "time") {
+        return $this->faker->$formatter($options);
+      }
+      $options = explode(",", $options);
       return $this->faker->$formatter($options);
-      
     } else {
-      
       // get explodey
       $options = explode(",", $options);
       $count   = count($options);
@@ -119,25 +121,32 @@ public function formatOptionsAndFake($formatter, $options) {
       $option0 = $this->clean($options[0]);
       $option1 = isset($options[1]) ? $this->clean($options[1]) : "";
       $option2 = isset($options[2]) ? $this->clean($options[2]) : "";
-      $option3 = isset($options[3]) ? $this->clean($options[3]) : "";
+      $option3 = isset($options[3]) ? $this->clean($options[3]) : ""; 
       $option4 = isset($options[4]) ? $this->clean($options[4]) : "";
       $option5 = isset($options[5]) ? $this->clean($options[5]) : "";
       $option6 = isset($options[6]) ? $this->clean($options[6]) : "";
       
-      // probably should have used a switch. i'm lazy
       try {
-        if ($count === 6) {
-          return $this->faker->$formatter($option0,$option1,$option2,$option3,$option4,$option5);
-        } else if ($count === 5) {
-          return $this->faker->$formatter($option0,$option1,$option2,$option3,$option4);
-        } else if ($count === 4) {
-          return $this->faker->$formatter($option0,$option1,$option2,$option3);
-        } else if ($count === 3) {
-          return $this->faker->$formatter($option0,$option1,$option2);
-        } else if ($count === 2) {
-          return $this->faker->$formatter($option0,$option1);
-        } else {
-          return $this->faker->$formatter($option0);
+        switch ($count) {
+          case 6:
+            return $this->faker->$formatter($option0,$option1,$option2,$option3,$option4,$option5);
+            break;
+          case 5:
+            return $this->faker->$formatter($option0,$option1,$option2,$option3,$option4);
+            break;
+          case 4:
+            return $this->faker->$formatter($option0,$option1,$option2,$option3);
+            break;
+          case 3:
+            return $this->faker->$formatter($option0,$option1,$option2);
+            break;
+          case 2:
+            return $this->faker->$formatter($option0,$option1);
+            break;
+          
+          default:
+            return $this->faker->$formatter($option0);
+            break;
         }
       } catch (\InvalidArgumentException $e) {
         Console::writeWarning("Faker plugin error: ".$e->getMessage()."...");

From 2752fe55c5a1424efe04a16d729e4c6492d1baec Mon Sep 17 00:00:00 2001
From: RedLucas <RedLucas@users.noreply.github.com>
Date: Tue, 6 Jun 2017 17:09:33 -0700
Subject: [PATCH 2/2] Turn a string that looks like an array one.

I know eval() can be a bad thing, but in this package's use case, I don't see any issue with this.
---
 src/PatternLab/Faker/PatternLabListener.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PatternLab/Faker/PatternLabListener.php b/src/PatternLab/Faker/PatternLabListener.php
index 046db5b..ec33738 100644
--- a/src/PatternLab/Faker/PatternLabListener.php
+++ b/src/PatternLab/Faker/PatternLabListener.php
@@ -110,7 +110,7 @@ public function formatOptionsAndFake($formatter, $options) {
       if ($formatter == "date" || $formatter == "time") {
         return $this->faker->$formatter($options);
       }
-      $options = explode(",", $options);
+      eval('$options = ' . $options . ';');
       return $this->faker->$formatter($options);
     } else {
       // get explodey