Revert "Allow alpha channel in Hex/RGB conversions"

This reverts commit 9afb95b.

Author: vmcj

webapp/tests/Unit/Utils/UtilsTest.php

@@ -320,7 +320,6 @@ public function testConvertToHexConvert(): void
         self::assertEquals('#AABBCC', Utils::convertToHex('#aabbcc'));
         self::assertEquals('#AAABBBCCC', Utils::convertToHex('#aaabbbccc'));
         self::assertEquals('#DEF', Utils::convertToHex('#def'));
-        self::assertEquals('#AABBCCDD', Utils::convertToHex('#aabbccdd'));
     }
 
     public function testParseHexColor(): void
@@ -330,14 +329,6 @@ public function testParseHexColor(): void
         self::assertEquals([0, 0, 0], Utils::parseHexColor('#000'));
         self::assertEquals([171, 205, 239], Utils::parseHexColor('#abcdef'));
         self::assertEquals([254, 220, 186], Utils::parseHexColor('#FEDCBA'));
-        self::assertEquals([255, 255, 255, 255], Utils::parseHexColor('#ffffff'));
-        self::assertEquals([0, 0, 0, 255], Utils::parseHexColor('#000000'));
-        self::assertEquals([0, 0, 0, 255], Utils::parseHexColor('#000'));
-        self::assertEquals([0, 0, 0, 0], Utils::parseHexColor('#00000000'));
-        self::assertEquals([0, 0, 0, 0], Utils::parseHexColor('#0000'));
-        self::assertEquals([171, 205, 239, 255], Utils::parseHexColor('#abcdef'));
-        self::assertEquals([254, 220, 186, 255], Utils::parseHexColor('#FEDCBA'));
-        self::assertEquals([254, 220, 186, 0], Utils::parseHexColor('#FEDCBA00'));
     }
 
     public function testComponentToHex(): void
@@ -350,44 +341,10 @@ public function testComponentToHex(): void
 
     public function testRgbToHex(): void
     {
-        self::assertEquals('#ffffffff', Utils::rgbToHex([255, 255, 255, 255]));
-        self::assertEquals('#ffffff00', Utils::rgbToHex([255, 255, 255, 0]));
-        self::assertEquals('#000000ff', Utils::rgbToHex([0, 0, 0, 255]));
-        self::assertEquals('#00000000', Utils::rgbToHex([0, 0, 0, 0]));
-        self::assertEquals('#abcdefff', Utils::rgbToHex([171, 205, 239, 255]));
-        self::assertEquals('#fedcbaff', Utils::rgbToHex([254, 220, 186, 255]));
-    }
-
-    public function testRelativeLuminance(): void
-    {
-        self::assertEquals(0.0, Utils::relativeLuminance("#000000"));
-        self::assertEquals(1.0, Utils::relativeLuminance("#FFFfff"));
-        self::assertEquals(1.0, Utils::relativeLuminance("#FFFfffFF"));
-        self::assertEquals(0.00751604342389449, Utils::relativeLuminance("#123"));
-        self::assertEquals(0.528186803960141, Utils::relativeLuminance("#1234"));
-    }
-
-    /**
-     * Test that the APCA contrast function returns the correct data
-     */
-    public function testApcaContrast(): void
-    {
-        self::assertEquals(-114.0, Utils::apcaContrast("#ffffff", "#000000"));
-        self::assertEquals(114.0, Utils::apcaContrast("#000000", "#ffffff"));
-        self::assertEquals(0.0, Utils::apcaContrast("#fffFFF", "#FFFfff"));
-        self::assertEquals(-0.36, Utils::apcaContrast("#111", "#111"));
-        self::assertEquals(58.09, Utils::apcaContrast("#123f", "#975A"));
-        self::assertEquals(25.15, Utils::apcaContrast("#11223344", "#00110011"));
-        self::assertEquals(-35.06, Utils::apcaContrast("#11223344", "#FF0011"));
-    }
-
-    public function testHexToForegroundAndBorder(): void
-    {
-        self::assertEquals(["#000000", "#bfbd9dff"], Utils::hexToForegroundAndBorder("#fffDDD"));
-        self::assertEquals(["#ffffff", "#000000ff"], Utils::hexToForegroundAndBorder("#000000"));
-        self::assertEquals(["#000000", "#6a7b8cff"], Utils::hexToForegroundAndBorder("#ABC"));
-        self::assertEquals(["#ffffff", "#00000099"], Utils::hexToForegroundAndBorder("#1239"));
-        self::assertEquals(["#000000", "#00000040"], Utils::hexToForegroundAndBorder("#10203040"));
+        self::assertEquals('#ffffff', Utils::rgbToHex([255, 255, 255]));
+        self::assertEquals('#000000', Utils::rgbToHex([0, 0, 0]));
+        self::assertEquals('#abcdef', Utils::rgbToHex([171, 205, 239]));
+        self::assertEquals('#fedcba', Utils::rgbToHex([254, 220, 186]));
     }
 
     public function testRelativeLuminance(): void
@@ -425,15 +382,10 @@ public function testHexToForegroundAndBorder(): void
     public function testConvertToHexUnknown(): void
     {
         self::assertNull(Utils::convertToHex('doesnotexist'));
-<<<<<<< HEAD
         self::assertNull(Utils::convertToHex('#aabbccdd'));
         self::assertNull(Utils::convertToHex('#12345h'));
         self::assertNull(Utils::convertToHex('#1234'));
         self::assertNull(Utils::convertToHex('#12'));
-=======
-        self::assertNull(Utils::convertToHex('#aabbccddee'));
-        self::assertNull(Utils::convertToHex('#12346h'));
->>>>>>> 8a732fda2 (Allow alpha channel in Hex/RGB conversions)
     }
 
     /**
@@ -852,7 +804,7 @@ public function testSanitizeSvg(): void
                 <a xlink:href="javascript:alert(2)">test 2</a>
                 <a href="#test3">test 3</a>
                 <a xlink:href="#test">test 4</a>
-
+            
                 <a href="data:data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' onload='alert(88)'%3E%3C/svg%3E">test 5</a>
                 <a xlink:href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' onload='alert(88)'%3E%3C/svg%3E">test 6</a>
                 <use xlink:href="defs.svg#icon-1"/>
@@ -865,7 +817,7 @@ public function testSanitizeSvg(): void
             <this>shouldn't be here</this>
             <script>alert(1);</script>
             <line fill="none" stroke="#000000" stroke-miterlimit="10" x1="541.54" y1="299.573" x2="543.179" y2="536.458"/>
-
+            
             </svg>
             EOF;
         $clean = Utils::sanitizeSvg($dirty);