Adjust colour validation calls

PHPOffice · Nov 1, 2020 · 613a0b9 · 613a0b9
1 parent 212fc75
commit 613a0b9
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/PhpSpreadsheet/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php
@@ -27,8 +27,9 @@ class Color extends Supervisor
     const COLOR_YELLOW = 'FFFFFF00';
     const COLOR_DARKYELLOW = 'FF808000';
 
-    const VALIDATE_ARGB = '/^[A-F0-9]{8}$/i';
-    const VALIDATE_RGB = '/^[A-F0-9]{6}$/i';
+    const VALIDATE_ARGB_SIZE = 8;
+    const VALIDATE_RGB_SIZE = 6;
+    const VALIDATE_COLOR_VALUE = '/^[A-F0-9]{%d}$/i';
 
     /**
      * Indexed colors array.
@@ -62,7 +63,7 @@ public function __construct($colorValue = self::COLOR_BLACK, $isSupervisor = fal
 
         //    Initialise values
         if (!$isConditional) {
-            $this->argb = $this->validateARGB($colorValue) ? $colorValue : self::COLOR_BLACK;
+            $this->argb = $this->validateColour($colorValue) ? $colorValue : self::COLOR_BLACK;
         }
     }
 
@@ -137,10 +138,10 @@ public function getARGB(): ?string
         return $this->argb;
     }
 
-    private function validateARGB(string $colorValue): bool
+    private function validateColour(string $colorValue, int $size): bool
     {
         return in_array(ucfirst($colorValue), self::NAMED_COLORS) ||
-            preg_match(self::VALIDATE_ARGB, $colorValue);
+            preg_match(sprintf(self::VALIDATE_COLOR_VALUE, $size), $colorValue);
     }
 
     /**
@@ -154,7 +155,7 @@ public function setARGB(?string $colorValue)
     {
         if ($colorValue === '' || $colorValue === null) {
             $colorValue = self::COLOR_BLACK;
-        } elseif (!$this->validateARGB($colorValue)) {
+        } elseif (!$this->validateColour($colorValue, self::VALIDATE_ARGB_SIZE)) {
             return $this;
         }
 
@@ -182,12 +183,6 @@ public function getRGB(): ?string
         return substr($this->argb, 2);
     }
 
-    private function validateRGB(string $colorValue): bool
-    {
-        return in_array(ucfirst($colorValue), self::NAMED_COLORS) ||
-            preg_match(self::VALIDATE_RGB, $colorValue);
-    }
-
     /**
      * Set RGB.
      *
@@ -199,7 +194,7 @@ public function setRGB(?string $colorValue)
     {
         if ($colorValue === '' || $colorValue === null) {
             $colorValue = '000000';
-        } elseif (!$this->validateRGB($colorValue)) {
+        } elseif (!$this->validateColour($colorValue, self::VALIDATE_RGB_SIZE)) {
             return $this;
         }