Issue #3415662 by joshua1234511, alex.skrypnyk: Error when trying to mix CT 1.7 colours (#1239)

Co-authored-by: Joshua Fernandes <“[email protected]”>
Co-authored-by: Alex Skrypnyk <[email protected]>

Author: 3 people

web/themes/contrib/civictheme/src/Color/CivicthemeColorUtility.php

@@ -55,7 +55,7 @@ public static function keywordToHex($value) {
    *   The origin color.
    * @param string|array $mixer
    *   The color to mix with.
-   * @param int $range
+   * @param string|int $range
    *   Range to apply the mixer color with. From 0 to 100.
    *
    * @return string
@@ -66,7 +66,13 @@ public static function keywordToHex($value) {
    *
    * @SuppressWarnings(MissingImport)
    */
-  public static function mix(string|array $color, string|array $mixer, int $range): string {
+  public static function mix(string|array $color, string|array $mixer, string|int $range): string {
+    if (!is_numeric($range)) {
+      throw new \Exception(sprintf('Numeric value is expected for range, but %s provided.', $range));
+    }
+
+    $range = (int) $range;
+
     $color = static::hexToRgb($color);
     $mixer = static::hexToRgb($mixer);
     $range = max(0, min($range, 100));

web/themes/contrib/civictheme/tests/src/Unit/CivicthemeColorUtilityUnitTest.php

@@ -46,7 +46,12 @@ public function dataProviderNormalizeHex(): array {
    * @dataProvider dataProviderMix
    * @SuppressWarnings(PHPMD.StaticAccess)
    */
-  public function testMix(string $color, string $mixer, int $range, string $expected): void {
+  public function testMix(string $color, string $mixer, string|int $range, string $expected, string|null $expected_exception_message = NULL): void {
+    if ($expected_exception_message) {
+      $this->expectException(\Exception::class);
+      $this->expectExceptionMessage($expected_exception_message);
+    }
+
     $actual = CivicthemeColorUtility::mix($color, $mixer, $range);
     $this->assertEquals($expected, $actual);
   }
@@ -59,6 +64,8 @@ public function dataProviderMix(): array {
       ['#00698f', '#000', 10, '#005e80'],
       ['#00698f', '#000', 0, '#00698f'],
       ['#e6e9eb', '#fff', 80, '#fafafb'],
+      ['#e6e9eb', '#fff', '80', '#fafafb'],
+      ['#00698f', '#000', 'alpha', '#005e80', 'Numeric value is expected for range, but alpha provided.'],
     ];
   }