Honor the monochrome option (davidmerfield/randomColor#89 by @jackwilsdon) (#10)

mundschenk-at · mistic100 · commit c7c824fe0929 · 2018-04-16T21:27:40.000+02:00
diff --git a/src/RandomColor.php b/src/RandomColor.php
@@ -107,14 +107,14 @@ static private function _pickHue($options)
 
   static private function _pickSaturation($h, $options)
   {
-    if (@$options['luminosity'] === 'random')
-    {
-      return self::_rand(array(0, 100), $options);
-    }
     if (@$options['hue'] === 'monochrome')
     {
       return 0;
     }
+    if (@$options['luminosity'] === 'random')
+    {
+      return self::_rand(array(0, 100), $options);
+    }
 
     $colorInfo = self::_getColorInfo($h);
     $range = $colorInfo['s'];

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,14 @@ static private function _pickHue($options)`
`107`	`107`
`108`	`108`	`static private function _pickSaturation($h, $options)`
`109`	`109`	`{`
`110`		`- if (@$options['luminosity'] === 'random')`
`111`		`- {`
`112`		`- return self::_rand(array(0, 100), $options);`
`113`		`- }`
`114`	`110`	`if (@$options['hue'] === 'monochrome')`
`115`	`111`	`{`
`116`	`112`	`return 0;`
`117`	`113`	`}`
	`114`	`+ if (@$options['luminosity'] === 'random')`
	`115`	`+ {`
	`116`	`+ return self::_rand(array(0, 100), $options);`
	`117`	`+ }`
`118`	`118`
`119`	`119`	`$colorInfo = self::_getColorInfo($h);`
`120`	`120`	`$range = $colorInfo['s'];`