Improved arguments string generation

mcustiel · mcustiel · commit 7cdc02e12153 · 2015-10-28T19:35:58.000+01:00
diff --git a/src/WiremockArguments.php b/src/WiremockArguments.php
@@ -40,13 +40,24 @@ public function generateArgumentsString(array $config)
 
         foreach ($config as $key => $value) {
             if (isset($this->map[$key])) {
-                $result .= " --{$key}" . ($this->map[$key]? " $value" : '');
+                $result .= $this->evaluateValueConfig($key, $this->map[$key], $value);
             }
         }
 
         return $result;
     }
 
+    private function evaluateValueConfig($key, $withValue, $value)
+    {
+        if ($withValue) {
+            return " --{$key} {$value}";
+        }
+        if ($value) {
+            return " --{$key}";
+        }
+        return '';
+    }
+
     public function sanitize(array $config)
     {
         $return = array_merge($this->defaults, $config);

Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,24 @@ public function generateArgumentsString(array $config)`
`40`	`40`
`41`	`41`	`foreach ($config as $key => $value) {`
`42`	`42`	`if (isset($this->map[$key])) {`
`43`		`- $result .= " --{$key}" . ($this->map[$key]? " $value" : '');`
	`43`	`+ $result .= $this->evaluateValueConfig($key, $this->map[$key], $value);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`return $result;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ private function evaluateValueConfig($key, $withValue, $value)`
	`51`	`+ {`
	`52`	`+ if ($withValue) {`
	`53`	`+ return " --{$key} {$value}";`
	`54`	`+ }`
	`55`	`+ if ($value) {`
	`56`	`+ return " --{$key}";`
	`57`	`+ }`
	`58`	`+ return '';`
	`59`	`+ }`
	`60`	`+`
`50`	`61`	`public function sanitize(array $config)`
`51`	`62`	`{`
`52`	`63`	`$return = array_merge($this->defaults, $config);`