[CLS] ColorFunct.RegEx

Author: xerc

src/CSS.php

@@ -495,11 +495,11 @@ protected function shortenHexColors($content)
         $content = preg_replace('/#([0-9a-f])\\1([0-9a-f])\\2([0-9a-f])\\3(?:([0-9a-f])\\4)?/i', '#$1$2$3$4', $content);
 
         // remove alpha channel if it's pointless ..
-        $content = preg_replace('/#([0-9a-f]{6})ff/i', '#$1', $content);
-        $content = preg_replace('/#([0-9a-f]{3})f/i', '#$1', $content);
+        $content = preg_replace('/#([0-9a-f]{6})ff/i',           '#$1', $content);
+        $content = preg_replace('/#([0-9a-f]{3})f(?=[ ;}\)])/i', '#$1', $content);
 
         // replace `transparent` with shortcut ..
-        $content = preg_replace('/#[0-9a-f]{6}00/i', '#0000', $content);
+        $content = preg_replace('/#[0-9a-f]{6}00/i', '#fff0', $content);
 
         $colors = array(
             // make these more readable
@@ -552,7 +552,7 @@ protected function shortenHexColors($content)
             'white'   => '#fff',
             'yellow'  => '#ff0',
             // and also `transparent`
-            #'transparent' => '#0000' CHECK safari
+            'transparent' => '#fff0'
         );
 
         return preg_replace_callback(
@@ -581,10 +581,10 @@ protected function shortenRGBColors($content)
         $dec = '([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])';// [000-255]
 
         // remove alpha channel if it's pointless ..
-        $content = preg_replace("/(rgb)a?\(([^,\s]+)[,\s]([^,\s]+)[,\s]([^,\s]+)\s?[,\/]\s?1(?:[\.\d]*|00%)?\)/i", '$1($2 $3 $4)', $content);
+        $content = preg_replace('/(rgb)a?\(([^,\s]+)[,\s]([^,\s]+)[,\s]([^,\s]+)\s?[,\/]\s?1(?:[\.\d]*|00%)?\)/i', '$1($2 $3 $4)', $content);
 
         // replace `transparent` with shortcut ..
-        #$content = preg_replace("/rgba?\([^,\s]+[,\s][^,\s]+[,\s][^,\s]+\s?[,\/]\s?0(?:[\.0%]*)?\)/i", '#0000', $content); CHECK safari
+        $content = preg_replace('/rgba?\([^,\s]+[,\s][^,\s]+[,\s][^,\s]+\s?[,\/]\s?0(?:[\.0%]*)?\)/i', '#fff0', $content);
 
         return preg_replace_callback(
             "/rgb\($dec[,\s]$dec[,\s]$dec\)/i",
@@ -612,10 +612,10 @@ protected function cleanupNEWColors($content)
         $pct = '((100(?:\.0+)|0?[0-9]?[0-9])(\.[0-9]+)%)';// [000.*-100] %
 
         // remove alpha channel if it's pointless ..
-        $content = preg_replace("/(hsl)a?\(([^,\s]+)[,\s]([^,\s]+)[,\s]([^,\s]+)\s?[,\/]\s?1(?:[\.\d]*|00%)?\)/i", '$1($2 $3 $4)', $content);
+        $content = preg_replace('/(hsl)a?\(([^,\s]+)[,\s]([^,\s]+)[,\s]([^,\s]+)\s?[,\/]\s?1(?:[\.\d]*|00%)?\)/i', '$1($2 $3 $4)', $content);
 
         // replace `transparent` with shortcut ..
-        #$content = preg_replace("/hsla?\([^,\s]+[,\s][^,\s]+[,\s][^,\s]+\s?[,\/]\s?0(?:[\.0%]*)?\)/i", '#0000', $content); CHECK safari
+        $content = preg_replace('/hsla?\([^,\s]+[,\s][^,\s]+[,\s][^,\s]+\s?[,\/]\s?0(?:[\.0%]*)?\)/i', '#fff0', $content);
 
         # ToRGB ?: https://github.com/mexitek/phpColors/blob/a74808eaf7cd918681aab0cd30f142025556bc8a/src/Mexitek/PHPColors/Color.php#L124
         #"/(hsl)a?\($hue[,\s]$pct[,\s]$pct[,\/]1(?:[\.\d]*|00%)?\)/i"
@@ -628,10 +628,10 @@ protected function cleanupNEWColors($content)
         */
 
         // remove alpha channel if it's pointless ..
-        $content = preg_replace("/(lch|lab|hwba?)\(([^\s]+)\s([^\s]+)\s([^\s]+)\s?\/\s?1(?:[\.\d]*|00%)?\)/i", '$1($2 $3 $4)', $content);
+        $content = preg_replace('/(lch|lab|hwba?)\(([^\s]+)\s([^\s]+)\s([^\s]+)\s?\/\s?1(?:[\.\d]*|00%)?\)/i', '$1($2 $3 $4)', $content);
 
         // replace `transparent` with shortcut ..
-        #$content = preg_replace("/(lch|lab)\([^\s]+\s[^\s]+\s[^\s]+\s?\/\s?0(?:[\.0%]*)?\)/i", '#0000', $content); CHECK safari
+        $content = preg_replace('/(lch|lab)\([^\s]+\s[^\s]+\s[^\s]+\s?\/\s?0(?:[\.0%]*)?\)/i', '#fff0', $content);
 
         #"/(hwb)a?\($hue\s$pct\s$pct\s?\/\s?1(?:[\.\d]*|00%)?\)/i"
         #"/(lch|lab)\($pct\s$VAR\s$VAR\s?\/\s?1(?:[\.\d]*|00%)?\)/i"