elkarte / Elkarte

sources/ext/bad-behavior/bad-behavior/functions.inc.php

Braces +47 added lines, -20 removed lines

@@ -1,28 +1,37 @@ 
-<?php if (!defined('BB2_CORE')) die("I said no cheating!");
+<?php if (!defined('BB2_CORE'))
+{
+	die("I said no cheating!");
+}
 
 // Miscellaneous helper functions.
 
 // Quick and dirty check for an IPv6 address
-function is_ipv6($address) {
+function is_ipv6($address)
+{
 	return (strpos($address, ":")) ? TRUE : FALSE;
 }
 
 // stripos() needed because stripos is only present on PHP 5
-if (!function_exists('stripos')) {
-	function stripos($haystack,$needle,$offset = 0) {
+if (!function_exists('stripos'))
+{
+	function stripos($haystack,$needle,$offset = 0)
+	{
 		return(strpos(strtolower($haystack),strtolower($needle),$offset));
 	}
 }
 
 // str_split() needed because str_split is only present on PHP 5
-if (!function_exists('str_split')) {
+if (!function_exists('str_split'))
+{
 	function str_split($string, $split_length=1)
 	{
-		if ($split_length < 1) {
+		if ($split_length < 1)
+		{
 			return false;
 		}
 
-		for ($pos=0, $chunks = array(); $pos < strlen($string); $pos+=$split_length) {
+		for ($pos=0, $chunks = array(); $pos < strlen($string); $pos+=$split_length)
+		{
 			$chunks[] = substr($string, $pos, $split_length);
 		}
 		return $chunks;
@@ -30,28 +39,39 @@ 
 }
 
 // Convert a string to mixed-case on word boundaries.
-function uc_all($string) {
+function uc_all($string)
+{
 	$temp = preg_split('/(\W)/', str_replace("_", "-", $string), -1, PREG_SPLIT_DELIM_CAPTURE);
-	foreach ($temp as $key=>$word) {
+	foreach ($temp as $key=>$word)
+	{
 		$temp[$key] = ucfirst(strtolower($word));
 	}
 	return join ('', $temp);
 }
 
 // Determine if an IP address resides in a CIDR netblock or netblocks.
-function match_cidr($addr, $cidr) {
+function match_cidr($addr, $cidr)
+{
 	$output = false;
 
-	if (is_array($cidr)) {
-		foreach ($cidr as $cidrlet) {
-			if (match_cidr($addr, $cidrlet)) {
+	if (is_array($cidr))
+	{
+		foreach ($cidr as $cidrlet)
+		{
+			if (match_cidr($addr, $cidrlet))
+			{
 				$output = true;
 				break;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		@list($ip, $mask) = explode('/', $cidr);
-		if (!$mask) $mask = 32;
+		if (!$mask)
+		{
+			$mask = 32;
+		}
 		$mask = pow(2,32) - pow(2, (32 - $mask));
 		$output = ((ip2long($addr) & $mask) == (ip2long($ip) & $mask));
 	}
@@ -59,19 +79,26 @@ 
 }
 
 // Determine if an IP address is reserved by RFC 1918.
-function is_rfc1918($addr) {
+function is_rfc1918($addr)
+{
 	return match_cidr($addr, array("10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"));
 }
 // Obtain all the HTTP headers.
 // NB: on PHP-CGI we have to fake it out a bit, since we can't get the REAL
 // headers. Run PHP as Apache 2.0 module if possible for best results.
-function bb2_load_headers() {
-	if (!is_callable('getallheaders')) {
+function bb2_load_headers()
+{
+	if (!is_callable('getallheaders'))
+	{
 		$headers = array();
 		foreach ($_SERVER as $h => $v)
-			if (preg_match('/HTTP_(.+)/', $h, $hp))
+		{
+					if (preg_match('/HTTP_(.+)/', $h, $hp))
 				$headers[str_replace("_", "-", uc_all($hp[1]))] = $v;
-	} else {
+		}
+	}
+	else
+	{
 		$headers = getallheaders();
 	}
 	return $headers;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 // Quick and dirty check for an IPv6 address
 function is_ipv6($address) {
-	return (strpos($address, ":")) ? TRUE : FALSE;
+	return (strpos($address, ":")) ? true : false;
 }
 
 // stripos() needed because stripos is only present on PHP 5

Spacing +6 added lines, -6 removed lines

@@ -9,20 +9,20 @@ 
 
 // stripos() needed because stripos is only present on PHP 5
 if (!function_exists('stripos')) {
-	function stripos($haystack,$needle,$offset = 0) {
-		return(strpos(strtolower($haystack),strtolower($needle),$offset));
+	function stripos($haystack, $needle, $offset = 0) {
+		return(strpos(strtolower($haystack), strtolower($needle), $offset));
 	}
 }
 
 // str_split() needed because str_split is only present on PHP 5
 if (!function_exists('str_split')) {
-	function str_split($string, $split_length=1)
+	function str_split($string, $split_length = 1)
 	{
 		if ($split_length < 1) {
 			return false;
 		}
 
-		for ($pos=0, $chunks = array(); $pos < strlen($string); $pos+=$split_length) {
+		for ($pos = 0, $chunks = array(); $pos < strlen($string); $pos += $split_length) {
 			$chunks[] = substr($string, $pos, $split_length);
 		}
 		return $chunks;
@@ -35,7 +35,7 @@ 
 	foreach ($temp as $key=>$word) {
 		$temp[$key] = ucfirst(strtolower($word));
 	}
-	return join ('', $temp);
+	return join('', $temp);
 }
 
 // Determine if an IP address resides in a CIDR netblock or netblocks.
@@ -52,7 +52,7 @@ 
 	} else {
 		@list($ip, $mask) = explode('/', $cidr);
 		if (!$mask) $mask = 32;
-		$mask = pow(2,32) - pow(2, (32 - $mask));
+		$mask = pow(2, 32) - pow(2, (32 - $mask));
 		$output = ((ip2long($addr) & $mask) == (ip2long($ip) & $mask));
 	}
 	return $output;

sources/ext/bad-behavior/bad-behavior/blacklist.inc.php

Braces +22 added lines, -10 removed lines

@@ -1,6 +1,10 @@ 
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
-function bb2_blacklist($package) {
+function bb2_blacklist($package)
+{
 
 	// Blacklisted user agents
 	// These user agent strings occur at the beginning of the line.
@@ -166,27 +170,35 @@ 
 	@$ua = $package['headers_mixed']['User-Agent'];
 	@$uri = $package['request_uri'];
 
-	foreach ($bb2_spambots_0 as $spambot) {
+	foreach ($bb2_spambots_0 as $spambot)
+	{
 		$pos = strpos($ua, $spambot);
-		if ($pos !== FALSE && $pos == 0) {
+		if ($pos !== FALSE && $pos == 0)
+		{
 			return "17f4e8c8";
 		}
 	}
 
-	foreach ($bb2_spambots as $spambot) {
-		if (strpos($ua, $spambot) !== FALSE) {
+	foreach ($bb2_spambots as $spambot)
+	{
+		if (strpos($ua, $spambot) !== FALSE)
+		{
 			return "17f4e8c8";
 		}
 	}
 
-	foreach ($bb2_spambots_regex as $spambot) {
-		if (preg_match($spambot, $ua)) {
+	foreach ($bb2_spambots_regex as $spambot)
+	{
+		if (preg_match($spambot, $ua))
+		{
 			return "17f4e8c8";
 		}
 	}
 
-	foreach ($bb2_spambots_url as $spambot) {
-		if (stripos($uri, $spambot) !== FALSE) {
+	foreach ($bb2_spambots_url as $spambot)
+	{
+		if (stripos($uri, $spambot) !== FALSE)
+		{
 			return "96c0bd29";
 		}
 	}

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -168,13 +168,13 @@ 
 
 	foreach ($bb2_spambots_0 as $spambot) {
 		$pos = strpos($ua, $spambot);
-		if ($pos !== FALSE && $pos == 0) {
+		if ($pos !== false && $pos == 0) {
 			return "17f4e8c8";
 		}
 	}
 
 	foreach ($bb2_spambots as $spambot) {
-		if (strpos($ua, $spambot) !== FALSE) {
+		if (strpos($ua, $spambot) !== false) {
 			return "17f4e8c8";
 		}
 	}
@@ -186,10 +186,10 @@ 
 	}
 
 	foreach ($bb2_spambots_url as $spambot) {
-		if (stripos($uri, $spambot) !== FALSE) {
+		if (stripos($uri, $spambot) !== false) {
 			return "96c0bd29";
 		}
 	}
 
-	return FALSE;
+	return false;
 }

Spacing +134 added lines, -134 removed lines

@@ -5,160 +5,160 @@
 	// Blacklisted user agents
 	// These user agent strings occur at the beginning of the line.
 	$bb2_spambots_0 = array(
-		"-",	// brute force password attempts, malicious botnet
-		"8484 Boston Project",	// video poker/porn spam
-		"ArchiveTeam",	// ignores robots.txt and hammers server
-		"adwords",		// referrer spam
-		"autoemailspider",	// spam harvester
-		"blogsearchbot-martin",	// from honeypot
-		"BrowserEmulator/",	// open proxy software
-		"CherryPicker",		// spam harvester
-		"core-project/",	// FrontPage extension exploits
-		"Diamond",		// delivers spyware/adware
-		"Digger",		// spam harvester
-		"ecollector",		// spam harvester
-		"EmailCollector",	// spam harvester
-		"Email Siphon",		// spam harvester
-		"EmailSiphon",		// spam harvester
-		"Forum Poster",		// forum spambot
-		"grub crawler",		// misc comment/email spam
-		"HttpProxy",		// misc comment/email spam
-		"Internet Explorer",	// XMLRPC exploits seen
-		"ISC Systems iRc",	// spam harvester
-		"Jakarta Commons",	// customised spambots
-		"Java 1.",		// unidentified robots
-		"Java/1.",		// unidentified robots
-		"libwww-perl",		// unidentified robots
-		"LWP",			// unidentified robots
-		"lwp",			// unidentified robots
-		"Microsoft Internet Explorer/",	// too old; assumed robot
-		"Microsoft URL",	// unidentified robots
-		"Missigua",		// spam harvester
-		"MJ12bot/v1.0.8",	// malicious botnet
-		"Morfeus",		// vulnerability scanner
-		"Movable Type",		// customised spambots
+		"-", // brute force password attempts, malicious botnet
+		"8484 Boston Project", // video poker/porn spam
+		"ArchiveTeam", // ignores robots.txt and hammers server
+		"adwords", // referrer spam
+		"autoemailspider", // spam harvester
+		"blogsearchbot-martin", // from honeypot
+		"BrowserEmulator/", // open proxy software
+		"CherryPicker", // spam harvester
+		"core-project/", // FrontPage extension exploits
+		"Diamond", // delivers spyware/adware
+		"Digger", // spam harvester
+		"ecollector", // spam harvester
+		"EmailCollector", // spam harvester
+		"Email Siphon", // spam harvester
+		"EmailSiphon", // spam harvester
+		"Forum Poster", // forum spambot
+		"grub crawler", // misc comment/email spam
+		"HttpProxy", // misc comment/email spam
+		"Internet Explorer", // XMLRPC exploits seen
+		"ISC Systems iRc", // spam harvester
+		"Jakarta Commons", // customised spambots
+		"Java 1.", // unidentified robots
+		"Java/1.", // unidentified robots
+		"libwww-perl", // unidentified robots
+		"LWP", // unidentified robots
+		"lwp", // unidentified robots
+		"Microsoft Internet Explorer/", // too old; assumed robot
+		"Microsoft URL", // unidentified robots
+		"Missigua", // spam harvester
+		"MJ12bot/v1.0.8", // malicious botnet
+		"Morfeus", // vulnerability scanner
+		"Movable Type", // customised spambots
 // msnbot is using this fake user agent string now
 		//"Mozilla ",		// malicious software
-		"Mozilla/0",		// malicious software
-		"Mozilla/1",		// malicious software
-		"Mozilla/2",		// malicious software
-		"Mozilla/3",		// malicious software
-		"Mozilla/4.0(",		// from honeypot
-		"Mozilla/4.0+(compatible;+",	// suspicious harvester
-		"Mozilla/4.0 (Hydra)",	// brute force tool
-		"MSIE",			// malicious software
-		"MVAClient",		// automated hacking attempts
-		"Nessus",		// vulnerability scanner
-		"NutchCVS",		// unidentified robots
-		"Nutscrape/",		// misc comment spam
-		"OmniExplorer",		// spam harvester
-		"Opera/9.64(",		// comment spam bot
-		"PMAFind",		// vulnerability scanner
-		"psycheclone",		// spam harvester
-		"PussyCat ",		// misc comment spam
-		"PycURL",		// misc comment spam
-		"Python-urllib",	// commonly abused
-		"revolt",		// vulnerability scanner
+		"Mozilla/0", // malicious software
+		"Mozilla/1", // malicious software
+		"Mozilla/2", // malicious software
+		"Mozilla/3", // malicious software
+		"Mozilla/4.0(", // from honeypot
+		"Mozilla/4.0+(compatible;+", // suspicious harvester
+		"Mozilla/4.0 (Hydra)", // brute force tool
+		"MSIE", // malicious software
+		"MVAClient", // automated hacking attempts
+		"Nessus", // vulnerability scanner
+		"NutchCVS", // unidentified robots
+		"Nutscrape/", // misc comment spam
+		"OmniExplorer", // spam harvester
+		"Opera/9.64(", // comment spam bot
+		"PMAFind", // vulnerability scanner
+		"psycheclone", // spam harvester
+		"PussyCat ", // misc comment spam
+		"PycURL", // misc comment spam
+		"Python-urllib", // commonly abused
+		"revolt", // vulnerability scanner
 //		WP 2.5 now has Flash; FIXME
 //		"Shockwave Flash",	// spam harvester
-		"sqlmap/",		// SQL injection
-		"Super Happy Fun ",	// spam harvester
-		"TrackBack/",		// trackback spam
-		"user",			// suspicious harvester
-		"User Agent: ",		// spam harvester
-		"User-Agent: ",		// spam harvester
-		"w3af",			// vulnerability scanner
-		"WebSite-X Suite",	// misc comment spam
-		"Winnie Poh",		// Automated Coppermine hacks
-		"Wordpress",		// malicious software
-		"\"",			// malicious software
+		"sqlmap/", // SQL injection
+		"Super Happy Fun ", // spam harvester
+		"TrackBack/", // trackback spam
+		"user", // suspicious harvester
+		"User Agent: ", // spam harvester
+		"User-Agent: ", // spam harvester
+		"w3af", // vulnerability scanner
+		"WebSite-X Suite", // misc comment spam
+		"Winnie Poh", // Automated Coppermine hacks
+		"Wordpress", // malicious software
+		"\"", // malicious software
 	);
 
 	// These user agent strings occur anywhere within the line.
 	$bb2_spambots = array(
-		"\r",			// A really dumb bot
-		"<sc",			// XSS exploit attempts
-		"; Widows ",		// misc comment/email spam
-		": ;",			// shellshock
-		":;",			// shellshock
-		"a href=",		// referrer spam
-		"ArchiveBot",	// ignores robots.txt and hammers server
-		"Bad Behavior Test",	// Add this to your user-agent to test BB
-		"compatible ; MSIE",	// misc comment/email spam
-		"compatible-",		// misc comment/email spam
-		"DTS Agent",		// misc comment/email spam
-		"Email Extractor",	// spam harvester
-		"Firebird/",		// too old; assumed robot
-		"Gecko/2525",		// revisit this in 500 years
-		"grub-client",		// search engine ignores robots.txt
-		"hanzoweb",		// very badly behaved crawler
-		"Havij",		// SQL injection tool
-		"Indy Library",		// misc comment/email spam
-		"Ming Mong",		// brute force tool
-		"MSIE 7.0;  Windows NT 5.2",	// Cyveillance
-		"Murzillo compatible",	// comment spam bot
-		".NET CLR 1)",		// free poker, etc.
-		".NET CLR1",		// spam harvester
-		"Netsparker",		// vulnerability scanner
-		"Nikto/",		// vulnerability scanner
-		"Perman Surfer",	// old and very broken harvester
-		"POE-Component-Client",	// free poker, etc.
-		"Teh Forest Lobster",	// brute force tool
-		"Turing Machine",	// www.anonymizer.com abuse
-		"Ubuntu/9.25",		// comment spam bot
-		"unspecified.mail",	// stealth harvesters
-		"User-agent: ",		// spam harvester/splogger
-		"WebaltBot",		// spam harvester
-		"WISEbot",		// spam harvester
-		"WISEnutbot",		// spam harvester
-		"Win95",		// too old; assumed robot
-		"Win98",		// too old; assumed robot
-		"WinME",		// too old; assumed robot
-		"Win 9x 4.90",		// too old; assumed robot
-		"Windows 3",		// too old; assumed robot
-		"Windows 95",		// too old; assumed robot
-		"Windows 98",		// too old; assumed robot
-		"Windows NT 4",		// too old; assumed robot
-		"Windows NT;",		// too old; assumed robot
+		"\r", // A really dumb bot
+		"<sc", // XSS exploit attempts
+		"; Widows ", // misc comment/email spam
+		": ;", // shellshock
+		":;", // shellshock
+		"a href=", // referrer spam
+		"ArchiveBot", // ignores robots.txt and hammers server
+		"Bad Behavior Test", // Add this to your user-agent to test BB
+		"compatible ; MSIE", // misc comment/email spam
+		"compatible-", // misc comment/email spam
+		"DTS Agent", // misc comment/email spam
+		"Email Extractor", // spam harvester
+		"Firebird/", // too old; assumed robot
+		"Gecko/2525", // revisit this in 500 years
+		"grub-client", // search engine ignores robots.txt
+		"hanzoweb", // very badly behaved crawler
+		"Havij", // SQL injection tool
+		"Indy Library", // misc comment/email spam
+		"Ming Mong", // brute force tool
+		"MSIE 7.0;  Windows NT 5.2", // Cyveillance
+		"Murzillo compatible", // comment spam bot
+		".NET CLR 1)", // free poker, etc.
+		".NET CLR1", // spam harvester
+		"Netsparker", // vulnerability scanner
+		"Nikto/", // vulnerability scanner
+		"Perman Surfer", // old and very broken harvester
+		"POE-Component-Client", // free poker, etc.
+		"Teh Forest Lobster", // brute force tool
+		"Turing Machine", // www.anonymizer.com abuse
+		"Ubuntu/9.25", // comment spam bot
+		"unspecified.mail", // stealth harvesters
+		"User-agent: ", // spam harvester/splogger
+		"WebaltBot", // spam harvester
+		"WISEbot", // spam harvester
+		"WISEnutbot", // spam harvester
+		"Win95", // too old; assumed robot
+		"Win98", // too old; assumed robot
+		"WinME", // too old; assumed robot
+		"Win 9x 4.90", // too old; assumed robot
+		"Windows 3", // too old; assumed robot
+		"Windows 95", // too old; assumed robot
+		"Windows 98", // too old; assumed robot
+		"Windows NT 4", // too old; assumed robot
+		"Windows NT;", // too old; assumed robot
 		#"Windows NT 4.0;)",	// wikispam bot
-		"Windows NT 5.0;)",	// wikispam bot
-		"Windows NT 5.1;)",	// wikispam bot
-		"Windows XP 5",		// spam harvester
-		"WordPress/4.01",	// pingback spam
-		"Xedant Human Emulator",// spammer script engine
-		"ZmEu",			// exploit scanner
-		"\\\\)",		// spam harvester
+		"Windows NT 5.0;)", // wikispam bot
+		"Windows NT 5.1;)", // wikispam bot
+		"Windows XP 5", // spam harvester
+		"WordPress/4.01", // pingback spam
+		"Xedant Human Emulator", // spammer script engine
+		"ZmEu", // exploit scanner
+		"\\\\)", // spam harvester
 	);
 
 	// These are regular expression matches.
 	$bb2_spambots_regex = array(
-		"/^[A-Z]{10}$/",	// misc email spam
+		"/^[A-Z]{10}$/", // misc email spam
 		"/[bcdfghjklmnpqrstvwxz ]{8,}/",
 //		"/(;\){1,2}$/",		// misc spammers/harvesters
-		"/MSIE.*Windows XP/",	// misc comment spam
-		"/MSIE [2345]/",	// too old; assumed robot
+		"/MSIE.*Windows XP/", // misc comment spam
+		"/MSIE [2345]/", // too old; assumed robot
 	);
 
 	// Blacklisted URL strings
 	// These strings are considered case-insensitive.
 	$bb2_spambots_url = array(
-		"0x31303235343830303536",	// Havij
-		"../",				// path traversal
-		"..\\",				// path traversal
-		"%60information_schema%60",	// SQL injection probe
-		"+%2F*%21",			// SQL injection probe
-		"%27--",			// SQL injection
-		"%27 --",			// SQL injection
-		"%27%23",			// SQL injection
-		"%27 %23",			// SQL injection
-		"benchmark%28",			// SQL injection probe
-		"insert+into+",			// SQL injection
-		"r3dm0v3",			// SQL injection probe
-		"select+1+from",		// SQL injection probe
-		"union+all+select",		// SQL injection probe
-		"union+select",			// SQL injection probe
-		"waitfor+delay+",		// SQL injection probe
-		"w00tw00t",			// vulnerability scanner
+		"0x31303235343830303536", // Havij
+		"../", // path traversal
+		"..\\", // path traversal
+		"%60information_schema%60", // SQL injection probe
+		"+%2F*%21", // SQL injection probe
+		"%27--", // SQL injection
+		"%27 --", // SQL injection
+		"%27%23", // SQL injection
+		"%27 %23", // SQL injection
+		"benchmark%28", // SQL injection probe
+		"insert+into+", // SQL injection
+		"r3dm0v3", // SQL injection probe
+		"select+1+from", // SQL injection probe
+		"union+all+select", // SQL injection probe
+		"union+select", // SQL injection probe
+		"waitfor+delay+", // SQL injection probe
+		"w00tw00t", // vulnerability scanner
 	);
 
 	// Do not edit below this line.

sources/ext/bad-behavior/bad-behavior/movabletype.inc.php

Braces +8 added lines, -3 removed lines

@@ -1,10 +1,15 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 function bb2_movabletype($package)
 {
 	// Is it a trackback?
-	if (strcasecmp($package['request_method'], "POST")) {
-		if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
+	if (strcasecmp($package['request_method'], "POST"))
+	{
+		if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999"))
+		{
 			return "7d12528e";
 		}
 	}

sources/ext/bad-behavior/bad-behavior/blackhole.inc.php

Braces +32 added lines, -12 removed lines

@@ -1,11 +1,18 @@ 
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 // Look up address on various blackhole lists.
 // These should not be used for GET requests under any circumstances!
 // FIXME: Note that this code is no longer in use
-function bb2_blackhole($package) {
+function bb2_blackhole($package)
+{
 	// Can't use IPv6 addresses yet
-	if (@is_ipv6($package['ip'])) return false;
+	if (@is_ipv6($package['ip']))
+	{
+		return false;
+	}
 
 	// Workaround for "MySQL server has gone away"
 	bb2_db_query("SET @@session.wait_timeout = 90");
@@ -29,12 +36,15 @@ 
 	// Check the blackhole lists
 	$ip = $package['ip'];
 	$find = implode('.', array_reverse(explode('.', $ip)));
-	foreach ($bb2_blackhole_lists as $dnsbl) {
+	foreach ($bb2_blackhole_lists as $dnsbl)
+	{
 		$result = gethostbynamel($find . "." . $dnsbl . ".");
-		if (!empty($result)) {
+		if (!empty($result))
+		{
 			// Got a match and it isn't on the exception list
 			$result = @array_diff($result, $bb2_blackhole_exceptions[$dnsbl]);
-			if (!empty($result)) {
+			if (!empty($result))
+			{
 				return '136673cd';
 			}
 		}
@@ -42,24 +52,34 @@ 
 	return false;
 }
 
-function bb2_httpbl($settings, $package) {
+function bb2_httpbl($settings, $package)
+{
 	// Can't use IPv6 addresses yet
-	if (@is_ipv6($package['ip'])) return false;
+	if (@is_ipv6($package['ip']))
+	{
+		return false;
+	}
 
-	if (@!$settings['httpbl_key']) return false;
+	if (@!$settings['httpbl_key'])
+	{
+		return false;
+	}
 
 	// Workaround for "MySQL server has gone away"
 	bb2_db_query("SET @@session.wait_timeout = 90");
 
 	$find = implode('.', array_reverse(explode('.', $package['ip'])));
 	$result = gethostbynamel($settings['httpbl_key'].".${find}.dnsbl.httpbl.org.");
-	if (!empty($result)) {
+	if (!empty($result))
+	{
 		$ip = explode('.', $result[0]);
-		if ($ip[0] == 127 && ($ip[3] & 7) && $ip[2] >= $settings['httpbl_threat'] && $ip[1] <= $settings['httpbl_maxage']) {
+		if ($ip[0] == 127 && ($ip[3] & 7) && $ip[2] >= $settings['httpbl_threat'] && $ip[1] <= $settings['httpbl_maxage'])
+		{
 			return '2b021b1f';
 		}
 		// Check if search engine
-		if ($ip[3] == 0) {
+		if ($ip[3] == 0)
+		{
 			return 1;
 		}
 	}

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 
 	// Only conservative lists
 	$bb2_blackhole_lists = array(
-		"sbl-xbl.spamhaus.org",	// All around nasties
+		"sbl-xbl.spamhaus.org", // All around nasties
 //		"dnsbl.sorbs.net",	// Old useless data.
 //		"list.dsbl.org",	// Old useless data.
 //		"dnsbl.ioerror.us",	// Bad Behavior Blackhole
@@ -20,8 +20,8 @@ 
 	
 	// Things that shouldn't be blocked, from aggregate lists
 	$bb2_blackhole_exceptions = array(
-		"sbl-xbl.spamhaus.org" => array("127.0.0.4"),	// CBL is problematic
-		"dnsbl.sorbs.net" => array("127.0.0.10",),	// Dynamic IPs only
+		"sbl-xbl.spamhaus.org" => array("127.0.0.4"), // CBL is problematic
+		"dnsbl.sorbs.net" => array("127.0.0.10",), // Dynamic IPs only
 		"list.dsbl.org" => array(),
 		"dnsbl.ioerror.us" => array(),
 	);
@@ -52,7 +52,7 @@ 
 	bb2_db_query("SET @@session.wait_timeout = 90");
 
 	$find = implode('.', array_reverse(explode('.', $package['ip'])));
-	$result = gethostbynamel($settings['httpbl_key'].".${find}.dnsbl.httpbl.org.");
+	$result = gethostbynamel($settings['httpbl_key'] . ".${find}.dnsbl.httpbl.org.");
 	if (!empty($result)) {
 		$ip = explode('.', $result[0]);
 		if ($ip[0] == 127 && ($ip[3] & 7) && $ip[2] >= $settings['httpbl_threat'] && $ip[1] <= $settings['httpbl_maxage']) {

sources/ext/bad-behavior/bad-behavior/cloudflare.inc.php

Braces +4 added lines, -1 removed lines

@@ -1,4 +1,7 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 // Analyze requests claiming to be from CloudFlare
 

sources/ext/bad-behavior/bad-behavior/screener.inc.php

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,7 @@ 
-<?php if (!defined('BB2_CWD')) die("I said no cheating!");
+<?php if (!defined('BB2_CWD'))
+{
+	die("I said no cheating!");
+}
 
 // Bad Behavior browser screener
 
@@ -49,10 +52,12 @@ 
 
 	// Set up a simple cookie
 	$screener = array(time(), $package['ip']);
-	if (isset($package['headers_mixed']['X-Forwarded-For'])) {
+	if (isset($package['headers_mixed']['X-Forwarded-For']))
+	{
 		array_push($screener, $package['headers_mixed']['X-Forwarded-For']);
 	}
-	if (isset($package['headers_mixed']['Client-Ip'])) {
+	if (isset($package['headers_mixed']['Client-Ip']))
+	{
 		array_push($screener, $package['headers_mixed']['Client-Ip']);
 	}
 

sources/ext/bad-behavior/bad-behavior/browser.inc.php

Braces +24 added lines, -11 removed lines

@@ -1,4 +1,7 @@ 
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 // Analyze user agents claiming to be Konqueror
 
@@ -6,8 +9,10 @@ 
 {
 	// CafeKelsa is a dev project at Yahoo which indexes job listings for
 	// Yahoo! HotJobs. It identifies as Konqueror so we skip these checks.
-	if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === FALSE || match_cidr($package['ip'], "209.73.160.0/19") === FALSE) {
-		if (!array_key_exists('Accept', $package['headers_mixed'])) {
+	if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === FALSE || match_cidr($package['ip'], "209.73.160.0/19") === FALSE)
+	{
+		if (!array_key_exists('Accept', $package['headers_mixed']))
+		{
 			return "17566707";
 		}
 	}
@@ -18,7 +23,8 @@ 
 
 function bb2_lynx($package)
 {
-	if (!array_key_exists('Accept', $package['headers_mixed'])) {
+	if (!array_key_exists('Accept', $package['headers_mixed']))
+	{
 		return "17566707";
 	}
 	return false;
@@ -32,8 +38,10 @@ 
 	// Google Desktop fixed it, but apparently some old versions are
 	// still out there. :(
 	// Always check accept header for Mozilla user agents
-	if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === FALSE && strpos($package['headers_mixed']['User-Agent'], "PLAYSTATION 3") === FALSE) {
-		if (!array_key_exists('Accept', $package['headers_mixed'])) {
+	if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === FALSE && strpos($package['headers_mixed']['User-Agent'], "PLAYSTATION 3") === FALSE)
+	{
+		if (!array_key_exists('Accept', $package['headers_mixed']))
+		{
 			return "17566707";
 		}
 	}
@@ -44,19 +52,22 @@ 
 
 function bb2_msie($package)
 {
-	if (!array_key_exists('Accept', $package['headers_mixed'])) {
+	if (!array_key_exists('Accept', $package['headers_mixed']))
+	{
 		return "17566707";
 	}
 
 	// MSIE does NOT send "Windows ME" or "Windows XP" in the user agent
-	if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Win32") !== FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Win32") !== FALSE)
+	{
 		return "a1084bad";
 	}
 
 	// MSIE does NOT send Connection: TE but Akamai does
 	// Bypass this test when Akamai detected
 	// The latest version of IE for Windows CE also uses Connection: TE
-	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === FALSE && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
+	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === FALSE && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection']))
+	{
 		return "2b90f772";
 	}
 
@@ -67,7 +78,8 @@ 
 
 function bb2_opera($package)
 {
-	if (!array_key_exists('Accept', $package['headers_mixed'])) {
+	if (!array_key_exists('Accept', $package['headers_mixed']))
+	{
 		return "17566707";
 	}
 	return false;
@@ -78,7 +90,8 @@ 
 function bb2_safari($package)
 {
 	// Bypass this test when Android is detected
-	if (!array_key_exists('Accept', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Android") === FALSE) {
+	if (!array_key_exists('Accept', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Android") === FALSE)
+	{
 		return "17566707";
 	}
 	return false;

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 {
 	// CafeKelsa is a dev project at Yahoo which indexes job listings for
 	// Yahoo! HotJobs. It identifies as Konqueror so we skip these checks.
-	if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === FALSE || match_cidr($package['ip'], "209.73.160.0/19") === FALSE) {
+	if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === false || match_cidr($package['ip'], "209.73.160.0/19") === false) {
 		if (!array_key_exists('Accept', $package['headers_mixed'])) {
 			return "17566707";
 		}
@@ -32,7 +32,7 @@ 
 	// Google Desktop fixed it, but apparently some old versions are
 	// still out there. :(
 	// Always check accept header for Mozilla user agents
-	if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === FALSE && strpos($package['headers_mixed']['User-Agent'], "PLAYSTATION 3") === FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === false && strpos($package['headers_mixed']['User-Agent'], "PLAYSTATION 3") === false) {
 		if (!array_key_exists('Accept', $package['headers_mixed'])) {
 			return "17566707";
 		}
@@ -49,14 +49,14 @@ 
 	}
 
 	// MSIE does NOT send "Windows ME" or "Windows XP" in the user agent
-	if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Win32") !== FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== false || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== false || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== false || strpos($package['headers_mixed']['User-Agent'], "Win32") !== false) {
 		return "a1084bad";
 	}
 
 	// MSIE does NOT send Connection: TE but Akamai does
 	// Bypass this test when Akamai detected
 	// The latest version of IE for Windows CE also uses Connection: TE
-	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === FALSE && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
+	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === false && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
 		return "2b90f772";
 	}
 
@@ -78,7 +78,7 @@ 
 function bb2_safari($package)
 {
 	// Bypass this test when Android is detected
-	if (!array_key_exists('Accept', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Android") === FALSE) {
+	if (!array_key_exists('Accept', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Android") === false) {
 		return "17566707";
 	}
 	return false;

sources/ext/cssmin/cssmin.php

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
  * @param string $input_css
  * @return string
  */
-function CSSmin($input_css) {
+function CSSmin($input_css)
+{
 	$compressor = new \tubalmartin\CssMin\Minifier();
 
 	// Split long lines in the output approximately every 1000 chars.

sources/ext/cssmin/tubalmartin/Minifier.php

Indentation +846 added lines, -846 removed lines

@@ -24,872 +24,872 @@
 
 class Minifier
 {
-    const QUERY_FRACTION = '_CSSMIN_QF_';
-    const COMMENT_TOKEN = '_CSSMIN_CMT_%d_';
-    const COMMENT_TOKEN_START = '_CSSMIN_CMT_';
-    const RULE_BODY_TOKEN = '_CSSMIN_RBT_%d_';
-    const PRESERVED_TOKEN = '_CSSMIN_PTK_%d_';
+	const QUERY_FRACTION = '_CSSMIN_QF_';
+	const COMMENT_TOKEN = '_CSSMIN_CMT_%d_';
+	const COMMENT_TOKEN_START = '_CSSMIN_CMT_';
+	const RULE_BODY_TOKEN = '_CSSMIN_RBT_%d_';
+	const PRESERVED_TOKEN = '_CSSMIN_PTK_%d_';
     
-    // Token lists
-    private $comments = array();
-    private $ruleBodies = array();
-    private $preservedTokens = array();
+	// Token lists
+	private $comments = array();
+	private $ruleBodies = array();
+	private $preservedTokens = array();
     
-    // Output options
-    private $keepImportantComments = true;
-    private $keepSourceMapComment = false;
-    private $linebreakPosition = 0;
+	// Output options
+	private $keepImportantComments = true;
+	private $keepSourceMapComment = false;
+	private $linebreakPosition = 0;
     
-    // PHP ini limits
-    private $raisePhpLimits;
-    private $memoryLimit;
-    private $maxExecutionTime = 60; // 1 min
-    private $pcreBacktrackLimit;
-    private $pcreRecursionLimit;
+	// PHP ini limits
+	private $raisePhpLimits;
+	private $memoryLimit;
+	private $maxExecutionTime = 60; // 1 min
+	private $pcreBacktrackLimit;
+	private $pcreRecursionLimit;
     
-    // Color maps
-    private $hexToNamedColorsMap;
-    private $namedToHexColorsMap;
+	// Color maps
+	private $hexToNamedColorsMap;
+	private $namedToHexColorsMap;
     
-    // Regexes
-    private $numRegex;
-    private $charsetRegex = '/@charset [^;]+;/Si';
-    private $importRegex = '/@import [^;]+;/Si';
-    private $namespaceRegex = '/@namespace [^;]+;/Si';
-    private $namedToHexColorsRegex;
-    private $shortenOneZeroesRegex;
-    private $shortenTwoZeroesRegex;
-    private $shortenThreeZeroesRegex;
-    private $shortenFourZeroesRegex;
-    private $unitsGroupRegex = '(?:ch|cm|em|ex|gd|in|mm|px|pt|pc|q|rem|vh|vmax|vmin|vw|%)';
-
-    /**
-     * @param bool|int $raisePhpLimits If true, PHP settings will be raised if needed
-     */
-    public function __construct($raisePhpLimits = true)
-    {
-        $this->raisePhpLimits = (bool) $raisePhpLimits;
-        $this->memoryLimit = 128 * 1048576; // 128MB in bytes
-        $this->pcreBacktrackLimit = 1000 * 1000;
-        $this->pcreRecursionLimit = 500 * 1000;
-        $this->hexToNamedColorsMap = Colors::getHexToNamedMap();
-        $this->namedToHexColorsMap = Colors::getNamedToHexMap();
-        $this->namedToHexColorsRegex = sprintf(
-            '/([:,( ])(%s)( |,|\)|;|$)/Si',
-            implode('|', array_keys($this->namedToHexColorsMap))
-        );
-        $this->numRegex = sprintf('-?\d*\.?\d+%s?', $this->unitsGroupRegex);
-        $this->setShortenZeroValuesRegexes();
-    }
-
-    /**
-     * Parses & minifies the given input CSS string
-     * @param string $css
-     * @return string
-     */
-    public function run($css = '')
-    {
-        if (empty($css) || !is_string($css)) {
-            return '';
-        }
-
-        $this->resetRunProperties();
-
-        if ($this->raisePhpLimits) {
-            $this->doRaisePhpLimits();
-        }
-
-        return $this->minify($css);
-    }
-
-    /**
-     * Sets whether to keep or remove sourcemap special comment.
-     * Sourcemap comments are removed by default.
-     * @param bool $keepSourceMapComment
-     */
-    public function keepSourceMapComment($keepSourceMapComment = true)
-    {
-        $this->keepSourceMapComment = (bool) $keepSourceMapComment;
-    }
-
-    /**
-     * Sets whether to keep or remove important comments.
-     * Important comments outside of a declaration block are kept by default.
-     * @param bool $removeImportantComments
-     */
-    public function removeImportantComments($removeImportantComments = true)
-    {
-        $this->keepImportantComments = !(bool) $removeImportantComments;
-    }
-
-    /**
-     * Sets the approximate column after which long lines will be splitted in the output
-     * with a linebreak.
-     * @param int $position
-     */
-    public function setLineBreakPosition($position)
-    {
-        $this->linebreakPosition = (int) $position;
-    }
-
-    /**
-     * Sets the memory limit for this script
-     * @param int|string $limit
-     */
-    public function setMemoryLimit($limit)
-    {
-        $this->memoryLimit = Utils::normalizeInt($limit);
-    }
-
-    /**
-     * Sets the maximum execution time for this script
-     * @param int|string $seconds
-     */
-    public function setMaxExecutionTime($seconds)
-    {
-        $this->maxExecutionTime = (int) $seconds;
-    }
-
-    /**
-     * Sets the PCRE backtrack limit for this script
-     * @param int $limit
-     */
-    public function setPcreBacktrackLimit($limit)
-    {
-        $this->pcreBacktrackLimit = (int) $limit;
-    }
-
-    /**
-     * Sets the PCRE recursion limit for this script
-     * @param int $limit
-     */
-    public function setPcreRecursionLimit($limit)
-    {
-        $this->pcreRecursionLimit = (int) $limit;
-    }
-
-    /**
-     * Builds regular expressions needed for shortening zero values
-     */
-    private function setShortenZeroValuesRegexes()
-    {
-        $zeroRegex = '0'. $this->unitsGroupRegex;
-        $numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) ';
-        $oneZeroSafeProperties = array(
-            '(?:line-)?height',
-            '(?:(?:min|max)-)?width',
-            'top',
-            'left',
-            'background-position',
-            'bottom',
-            'right',
-            'border(?:-(?:top|left|bottom|right))?(?:-width)?',
-            'border-(?:(?:top|bottom)-(?:left|right)-)?radius',
-            'column-(?:gap|width)',
-            'margin(?:-(?:top|left|bottom|right))?',
-            'outline-width',
-            'padding(?:-(?:top|left|bottom|right))?'
-        );
-
-        // First zero regex
-        $regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si';
-        $this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex);
-
-        // Multiple zeroes regexes
-        $regex = '/(^|;)(margin|padding|border-(?:width|radius)|background-position):%s/Si';
-        $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex . $zeroRegex);
-        $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $zeroRegex);
-        $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $numOrPosRegex . $zeroRegex);
-    }
-
-    /**
-     * Resets properties whose value may change between runs
-     */
-    private function resetRunProperties()
-    {
-        $this->comments = array();
-        $this->ruleBodies = array();
-        $this->preservedTokens = array();
-    }
-
-    /**
-     * Tries to configure PHP to use at least the suggested minimum settings
-     * @return void
-     */
-    private function doRaisePhpLimits()
-    {
-        $phpLimits = array(
-            'memory_limit' => $this->memoryLimit,
-            'max_execution_time' => $this->maxExecutionTime,
-            'pcre.backtrack_limit' => $this->pcreBacktrackLimit,
-            'pcre.recursion_limit' =>  $this->pcreRecursionLimit
-        );
-
-        // If current settings are higher respect them.
-        foreach ($phpLimits as $name => $suggested) {
-            $current = Utils::normalizeInt(ini_get($name));
-
-            if ($current >= $suggested) {
-                continue;
-            }
-
-            // memoryLimit exception: allow -1 for "no memory limit".
-            if ($name === 'memory_limit' && $current === -1) {
-                continue;
-            }
-
-            // maxExecutionTime exception: allow 0 for "no memory limit".
-            if ($name === 'max_execution_time' && $current === 0) {
-                continue;
-            }
-
-            ini_set($name, $suggested);
-        }
-    }
-
-    /**
-     * Registers a preserved token
-     * @param string $token
-     * @return string The token ID string
-     */
-    private function registerPreservedToken($token)
-    {
-        $tokenId = sprintf(self::PRESERVED_TOKEN, count($this->preservedTokens));
-        $this->preservedTokens[$tokenId] = $token;
-        return $tokenId;
-    }
-
-    /**
-     * Registers a candidate comment token
-     * @param string $comment
-     * @return string The comment token ID string
-     */
-    private function registerCommentToken($comment)
-    {
-        $tokenId = sprintf(self::COMMENT_TOKEN, count($this->comments));
-        $this->comments[$tokenId] = $comment;
-        return $tokenId;
-    }
-
-    /**
-     * Registers a rule body token
-     * @param string $body the minified rule body
-     * @return string The rule body token ID string
-     */
-    private function registerRuleBodyToken($body)
-    {
-        if (empty($body)) {
-            return '';
-        }
-
-        $tokenId = sprintf(self::RULE_BODY_TOKEN, count($this->ruleBodies));
-        $this->ruleBodies[$tokenId] = $body;
-        return $tokenId;
-    }
-
-    /**
-     * Parses & minifies the given input CSS string
-     * @param string $css
-     * @return string
-     */
-    private function minify($css)
-    {
-        // Process data urls
-        $css = $this->processDataUrls($css);
-
-        // Process comments
-        $css = preg_replace_callback(
-            '/(?<!\\\\)\/\*(.*?)\*(?<!\\\\)\//Ss',
-            array($this, 'processCommentsCallback'),
-            $css
-        );
-
-        // IE7: Process Microsoft matrix filters (whitespaces between Matrix parameters). Can contain strings inside.
-        $css = preg_replace_callback(
-            '/filter:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^)]+)\)/Ss',
-            array($this, 'processOldIeSpecificMatrixDefinitionCallback'),
-            $css
-        );
-
-        // Process quoted unquotable attribute selectors to unquote them. Covers most common cases.
-        // Likelyhood of a quoted attribute selector being a substring in a string: Very very low.
-        $css = preg_replace(
-            '/\[\s*([a-z][a-z-]+)\s*([\*\|\^\$~]?=)\s*[\'"](-?[a-z_][a-z0-9-_]+)[\'"]\s*\]/Ssi',
-            '[$1$2$3]',
-            $css
-        );
-
-        // Process strings so their content doesn't get accidentally minified
-        $css = preg_replace_callback(
-            '/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S",
-            array($this, 'processStringsCallback'),
-            $css
-        );
-
-        // Normalize all whitespace strings to single spaces. Easier to work with that way.
-        $css = preg_replace('/\s+/S', ' ', $css);
-
-        // Process import At-rules with unquoted URLs so URI reserved characters such as a semicolon may be used safely.
-        $css = preg_replace_callback(
-            '/@import url\(([^\'"]+?)\)( |;)/Si',
-            array($this, 'processImportUnquotedUrlAtRulesCallback'),
-            $css
-        );
+	// Regexes
+	private $numRegex;
+	private $charsetRegex = '/@charset [^;]+;/Si';
+	private $importRegex = '/@import [^;]+;/Si';
+	private $namespaceRegex = '/@namespace [^;]+;/Si';
+	private $namedToHexColorsRegex;
+	private $shortenOneZeroesRegex;
+	private $shortenTwoZeroesRegex;
+	private $shortenThreeZeroesRegex;
+	private $shortenFourZeroesRegex;
+	private $unitsGroupRegex = '(?:ch|cm|em|ex|gd|in|mm|px|pt|pc|q|rem|vh|vmax|vmin|vw|%)';
+
+	/**
+	 * @param bool|int $raisePhpLimits If true, PHP settings will be raised if needed
+	 */
+	public function __construct($raisePhpLimits = true)
+	{
+		$this->raisePhpLimits = (bool) $raisePhpLimits;
+		$this->memoryLimit = 128 * 1048576; // 128MB in bytes
+		$this->pcreBacktrackLimit = 1000 * 1000;
+		$this->pcreRecursionLimit = 500 * 1000;
+		$this->hexToNamedColorsMap = Colors::getHexToNamedMap();
+		$this->namedToHexColorsMap = Colors::getNamedToHexMap();
+		$this->namedToHexColorsRegex = sprintf(
+			'/([:,( ])(%s)( |,|\)|;|$)/Si',
+			implode('|', array_keys($this->namedToHexColorsMap))
+		);
+		$this->numRegex = sprintf('-?\d*\.?\d+%s?', $this->unitsGroupRegex);
+		$this->setShortenZeroValuesRegexes();
+	}
+
+	/**
+	 * Parses & minifies the given input CSS string
+	 * @param string $css
+	 * @return string
+	 */
+	public function run($css = '')
+	{
+		if (empty($css) || !is_string($css)) {
+			return '';
+		}
+
+		$this->resetRunProperties();
+
+		if ($this->raisePhpLimits) {
+			$this->doRaisePhpLimits();
+		}
+
+		return $this->minify($css);
+	}
+
+	/**
+	 * Sets whether to keep or remove sourcemap special comment.
+	 * Sourcemap comments are removed by default.
+	 * @param bool $keepSourceMapComment
+	 */
+	public function keepSourceMapComment($keepSourceMapComment = true)
+	{
+		$this->keepSourceMapComment = (bool) $keepSourceMapComment;
+	}
+
+	/**
+	 * Sets whether to keep or remove important comments.
+	 * Important comments outside of a declaration block are kept by default.
+	 * @param bool $removeImportantComments
+	 */
+	public function removeImportantComments($removeImportantComments = true)
+	{
+		$this->keepImportantComments = !(bool) $removeImportantComments;
+	}
+
+	/**
+	 * Sets the approximate column after which long lines will be splitted in the output
+	 * with a linebreak.
+	 * @param int $position
+	 */
+	public function setLineBreakPosition($position)
+	{
+		$this->linebreakPosition = (int) $position;
+	}
+
+	/**
+	 * Sets the memory limit for this script
+	 * @param int|string $limit
+	 */
+	public function setMemoryLimit($limit)
+	{
+		$this->memoryLimit = Utils::normalizeInt($limit);
+	}
+
+	/**
+	 * Sets the maximum execution time for this script
+	 * @param int|string $seconds
+	 */
+	public function setMaxExecutionTime($seconds)
+	{
+		$this->maxExecutionTime = (int) $seconds;
+	}
+
+	/**
+	 * Sets the PCRE backtrack limit for this script
+	 * @param int $limit
+	 */
+	public function setPcreBacktrackLimit($limit)
+	{
+		$this->pcreBacktrackLimit = (int) $limit;
+	}
+
+	/**
+	 * Sets the PCRE recursion limit for this script
+	 * @param int $limit
+	 */
+	public function setPcreRecursionLimit($limit)
+	{
+		$this->pcreRecursionLimit = (int) $limit;
+	}
+
+	/**
+	 * Builds regular expressions needed for shortening zero values
+	 */
+	private function setShortenZeroValuesRegexes()
+	{
+		$zeroRegex = '0'. $this->unitsGroupRegex;
+		$numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) ';
+		$oneZeroSafeProperties = array(
+			'(?:line-)?height',
+			'(?:(?:min|max)-)?width',
+			'top',
+			'left',
+			'background-position',
+			'bottom',
+			'right',
+			'border(?:-(?:top|left|bottom|right))?(?:-width)?',
+			'border-(?:(?:top|bottom)-(?:left|right)-)?radius',
+			'column-(?:gap|width)',
+			'margin(?:-(?:top|left|bottom|right))?',
+			'outline-width',
+			'padding(?:-(?:top|left|bottom|right))?'
+		);
+
+		// First zero regex
+		$regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si';
+		$this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex);
+
+		// Multiple zeroes regexes
+		$regex = '/(^|;)(margin|padding|border-(?:width|radius)|background-position):%s/Si';
+		$this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex . $zeroRegex);
+		$this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $zeroRegex);
+		$this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $numOrPosRegex . $zeroRegex);
+	}
+
+	/**
+	 * Resets properties whose value may change between runs
+	 */
+	private function resetRunProperties()
+	{
+		$this->comments = array();
+		$this->ruleBodies = array();
+		$this->preservedTokens = array();
+	}
+
+	/**
+	 * Tries to configure PHP to use at least the suggested minimum settings
+	 * @return void
+	 */
+	private function doRaisePhpLimits()
+	{
+		$phpLimits = array(
+			'memory_limit' => $this->memoryLimit,
+			'max_execution_time' => $this->maxExecutionTime,
+			'pcre.backtrack_limit' => $this->pcreBacktrackLimit,
+			'pcre.recursion_limit' =>  $this->pcreRecursionLimit
+		);
+
+		// If current settings are higher respect them.
+		foreach ($phpLimits as $name => $suggested) {
+			$current = Utils::normalizeInt(ini_get($name));
+
+			if ($current >= $suggested) {
+				continue;
+			}
+
+			// memoryLimit exception: allow -1 for "no memory limit".
+			if ($name === 'memory_limit' && $current === -1) {
+				continue;
+			}
+
+			// maxExecutionTime exception: allow 0 for "no memory limit".
+			if ($name === 'max_execution_time' && $current === 0) {
+				continue;
+			}
+
+			ini_set($name, $suggested);
+		}
+	}
+
+	/**
+	 * Registers a preserved token
+	 * @param string $token
+	 * @return string The token ID string
+	 */
+	private function registerPreservedToken($token)
+	{
+		$tokenId = sprintf(self::PRESERVED_TOKEN, count($this->preservedTokens));
+		$this->preservedTokens[$tokenId] = $token;
+		return $tokenId;
+	}
+
+	/**
+	 * Registers a candidate comment token
+	 * @param string $comment
+	 * @return string The comment token ID string
+	 */
+	private function registerCommentToken($comment)
+	{
+		$tokenId = sprintf(self::COMMENT_TOKEN, count($this->comments));
+		$this->comments[$tokenId] = $comment;
+		return $tokenId;
+	}
+
+	/**
+	 * Registers a rule body token
+	 * @param string $body the minified rule body
+	 * @return string The rule body token ID string
+	 */
+	private function registerRuleBodyToken($body)
+	{
+		if (empty($body)) {
+			return '';
+		}
+
+		$tokenId = sprintf(self::RULE_BODY_TOKEN, count($this->ruleBodies));
+		$this->ruleBodies[$tokenId] = $body;
+		return $tokenId;
+	}
+
+	/**
+	 * Parses & minifies the given input CSS string
+	 * @param string $css
+	 * @return string
+	 */
+	private function minify($css)
+	{
+		// Process data urls
+		$css = $this->processDataUrls($css);
+
+		// Process comments
+		$css = preg_replace_callback(
+			'/(?<!\\\\)\/\*(.*?)\*(?<!\\\\)\//Ss',
+			array($this, 'processCommentsCallback'),
+			$css
+		);
+
+		// IE7: Process Microsoft matrix filters (whitespaces between Matrix parameters). Can contain strings inside.
+		$css = preg_replace_callback(
+			'/filter:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^)]+)\)/Ss',
+			array($this, 'processOldIeSpecificMatrixDefinitionCallback'),
+			$css
+		);
+
+		// Process quoted unquotable attribute selectors to unquote them. Covers most common cases.
+		// Likelyhood of a quoted attribute selector being a substring in a string: Very very low.
+		$css = preg_replace(
+			'/\[\s*([a-z][a-z-]+)\s*([\*\|\^\$~]?=)\s*[\'"](-?[a-z_][a-z0-9-_]+)[\'"]\s*\]/Ssi',
+			'[$1$2$3]',
+			$css
+		);
+
+		// Process strings so their content doesn't get accidentally minified
+		$css = preg_replace_callback(
+			'/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S",
+			array($this, 'processStringsCallback'),
+			$css
+		);
+
+		// Normalize all whitespace strings to single spaces. Easier to work with that way.
+		$css = preg_replace('/\s+/S', ' ', $css);
+
+		// Process import At-rules with unquoted URLs so URI reserved characters such as a semicolon may be used safely.
+		$css = preg_replace_callback(
+			'/@import url\(([^\'"]+?)\)( |;)/Si',
+			array($this, 'processImportUnquotedUrlAtRulesCallback'),
+			$css
+		);
         
-        // Process comments
-        $css = $this->processComments($css);
+		// Process comments
+		$css = $this->processComments($css);
         
-        // Process rule bodies
-        $css = $this->processRuleBodies($css);
+		// Process rule bodies
+		$css = $this->processRuleBodies($css);
         
-        // Process at-rules and selectors
-        $css = $this->processAtRulesAndSelectors($css);
-
-        // Restore preserved rule bodies before splitting
-        $css = strtr($css, $this->ruleBodies);
-
-        // Split long lines in output if required
-        $css = $this->processLongLineSplitting($css);
-
-        // Restore preserved comments and strings
-        $css = strtr($css, $this->preservedTokens);
-
-        return trim($css);
-    }
-
-    /**
-     * Searches & replaces all data urls with tokens before we start compressing,
-     * to avoid performance issues running some of the subsequent regexes against large string chunks.
-     * @param string $css
-     * @return string
-     */
-    private function processDataUrls($css)
-    {
-        $ret = '';
-        $searchOffset = $substrOffset = 0;
-
-        // Since we need to account for non-base64 data urls, we need to handle
-        // ' and ) being part of the data string.
-        while (preg_match('/url\(\s*(["\']?)data:/Si', $css, $m, PREG_OFFSET_CAPTURE, $searchOffset)) {
-            $matchStartIndex = $m[0][1];
-            $dataStartIndex = $matchStartIndex + 4; // url( length
-            $searchOffset = $matchStartIndex + strlen($m[0][0]);
-            $terminator = $m[1][0]; // ', " or empty (not quoted)
-            $terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S';
+		// Process at-rules and selectors
+		$css = $this->processAtRulesAndSelectors($css);
+
+		// Restore preserved rule bodies before splitting
+		$css = strtr($css, $this->ruleBodies);
+
+		// Split long lines in output if required
+		$css = $this->processLongLineSplitting($css);
+
+		// Restore preserved comments and strings
+		$css = strtr($css, $this->preservedTokens);
+
+		return trim($css);
+	}
+
+	/**
+	 * Searches & replaces all data urls with tokens before we start compressing,
+	 * to avoid performance issues running some of the subsequent regexes against large string chunks.
+	 * @param string $css
+	 * @return string
+	 */
+	private function processDataUrls($css)
+	{
+		$ret = '';
+		$searchOffset = $substrOffset = 0;
+
+		// Since we need to account for non-base64 data urls, we need to handle
+		// ' and ) being part of the data string.
+		while (preg_match('/url\(\s*(["\']?)data:/Si', $css, $m, PREG_OFFSET_CAPTURE, $searchOffset)) {
+			$matchStartIndex = $m[0][1];
+			$dataStartIndex = $matchStartIndex + 4; // url( length
+			$searchOffset = $matchStartIndex + strlen($m[0][0]);
+			$terminator = $m[1][0]; // ', " or empty (not quoted)
+			$terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S';
             
-            $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset);
-
-            // Terminator found
-            if (preg_match($terminatorRegex, $css, $matches, PREG_OFFSET_CAPTURE, $searchOffset)) {
-                $matchEndIndex = $matches[1][1];
-                $searchOffset = $matchEndIndex + 1;
-                $token = substr($css, $dataStartIndex, $matchEndIndex - $dataStartIndex);
-
-                // Remove all spaces only for base64 encoded URLs.
-                if (stripos($token, 'base64,') !== false) {
-                    $token = preg_replace('/\s+/S', '', $token);
-                }
-
-                $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')';
-            // No end terminator found, re-add the whole match. Should we throw/warn here?
-            } else {
-                $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex);
-            }
-
-            $substrOffset = $searchOffset;
-        }
-
-        $ret .= substr($css, $substrOffset);
-
-        return $ret;
-    }
-
-    /**
-     * Registers all comments found as candidates to be preserved.
-     * @param array $matches
-     * @return string
-     */
-    private function processCommentsCallback($matches)
-    {
-        return '/*'. $this->registerCommentToken($matches[1]) .'*/';
-    }
-
-    /**
-     * Preserves old IE Matrix string definition
-     * @param array $matches
-     * @return string
-     */
-    private function processOldIeSpecificMatrixDefinitionCallback($matches)
-    {
-        return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')';
-    }
-
-    /**
-     * Preserves strings found
-     * @param array $matches
-     * @return string
-     */
-    private function processStringsCallback($matches)
-    {
-        $match = $matches[0];
-        $quote = substr($match, 0, 1);
-        $match = substr($match, 1, -1);
-
-        // maybe the string contains a comment-like substring?
-        // one, maybe more? put'em back then
-        if (strpos($match, self::COMMENT_TOKEN_START) !== false) {
-            $match = strtr($match, $this->comments);
-        }
-
-        // minify alpha opacity in filter strings
-        $match = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $match);
-
-        return $quote . $this->registerPreservedToken($match) . $quote;
-    }
-
-    /**
-     * Searches & replaces all import at-rule unquoted urls with tokens so URI reserved characters such as a semicolon
-     * may be used safely in a URL.
-     * @param array $matches
-     * @return string
-     */
-    private function processImportUnquotedUrlAtRulesCallback($matches)
-    {
-        return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2];
-    }
-
-    /**
-     * Preserves or removes comments found.
-     * @param string $css
-     * @return string
-     */
-    private function processComments($css)
-    {
-        foreach ($this->comments as $commentId => $comment) {
-            $commentIdString = '/*'. $commentId .'*/';
+			$ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset);
+
+			// Terminator found
+			if (preg_match($terminatorRegex, $css, $matches, PREG_OFFSET_CAPTURE, $searchOffset)) {
+				$matchEndIndex = $matches[1][1];
+				$searchOffset = $matchEndIndex + 1;
+				$token = substr($css, $dataStartIndex, $matchEndIndex - $dataStartIndex);
+
+				// Remove all spaces only for base64 encoded URLs.
+				if (stripos($token, 'base64,') !== false) {
+					$token = preg_replace('/\s+/S', '', $token);
+				}
+
+				$ret .= 'url('. $this->registerPreservedToken(trim($token)) .')';
+			// No end terminator found, re-add the whole match. Should we throw/warn here?
+			} else {
+				$ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex);
+			}
+
+			$substrOffset = $searchOffset;
+		}
+
+		$ret .= substr($css, $substrOffset);
+
+		return $ret;
+	}
+
+	/**
+	 * Registers all comments found as candidates to be preserved.
+	 * @param array $matches
+	 * @return string
+	 */
+	private function processCommentsCallback($matches)
+	{
+		return '/*'. $this->registerCommentToken($matches[1]) .'*/';
+	}
+
+	/**
+	 * Preserves old IE Matrix string definition
+	 * @param array $matches
+	 * @return string
+	 */
+	private function processOldIeSpecificMatrixDefinitionCallback($matches)
+	{
+		return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')';
+	}
+
+	/**
+	 * Preserves strings found
+	 * @param array $matches
+	 * @return string
+	 */
+	private function processStringsCallback($matches)
+	{
+		$match = $matches[0];
+		$quote = substr($match, 0, 1);
+		$match = substr($match, 1, -1);
+
+		// maybe the string contains a comment-like substring?
+		// one, maybe more? put'em back then
+		if (strpos($match, self::COMMENT_TOKEN_START) !== false) {
+			$match = strtr($match, $this->comments);
+		}
+
+		// minify alpha opacity in filter strings
+		$match = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $match);
+
+		return $quote . $this->registerPreservedToken($match) . $quote;
+	}
+
+	/**
+	 * Searches & replaces all import at-rule unquoted urls with tokens so URI reserved characters such as a semicolon
+	 * may be used safely in a URL.
+	 * @param array $matches
+	 * @return string
+	 */
+	private function processImportUnquotedUrlAtRulesCallback($matches)
+	{
+		return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2];
+	}
+
+	/**
+	 * Preserves or removes comments found.
+	 * @param string $css
+	 * @return string
+	 */
+	private function processComments($css)
+	{
+		foreach ($this->comments as $commentId => $comment) {
+			$commentIdString = '/*'. $commentId .'*/';
             
-            // ! in the first position of the comment means preserve
-            // so push to the preserved tokens keeping the !
-            if ($this->keepImportantComments && strpos($comment, '!') === 0) {
-                $preservedTokenId = $this->registerPreservedToken($comment);
-                // Put new lines before and after /*! important comments
-                $css = str_replace($commentIdString, "\n/*$preservedTokenId*/\n", $css);
-                continue;
-            }
-
-            // # sourceMappingURL= in the first position of the comment means sourcemap
-            // so push to the preserved tokens if {$this->keepSourceMapComment} is truthy.
-            if ($this->keepSourceMapComment && strpos($comment, '# sourceMappingURL=') === 0) {
-                $preservedTokenId = $this->registerPreservedToken($comment);
-                // Add new line before the sourcemap comment
-                $css = str_replace($commentIdString, "\n/*$preservedTokenId*/", $css);
-                continue;
-            }
-
-            // Keep empty comments after child selectors (IE7 hack)
-            // e.g. html >/**/ body
-            if (strlen($comment) === 0 && strpos($css, '>/*'.$commentId) !== false) {
-                $css = str_replace($commentId, $this->registerPreservedToken(''), $css);
-                continue;
-            }
-
-            // in all other cases kill the comment
-            $css = str_replace($commentIdString, '', $css);
-        }
-
-        // Normalize whitespace again
-        $css = preg_replace('/ +/S', ' ', $css);
-
-        return $css;
-    }
-
-    /**
-     * Finds, minifies & preserves all rule bodies.
-     * @param string $css the whole stylesheet.
-     * @return string
-     */
-    private function processRuleBodies($css)
-    {
-        $ret = '';
-        $searchOffset = $substrOffset = 0;
-
-        while (($blockStartPos = strpos($css, '{', $searchOffset)) !== false) {
-            $blockEndPos = strpos($css, '}', $blockStartPos);
-            $nextBlockStartPos = strpos($css, '{', $blockStartPos + 1);
-            $ret .= substr($css, $substrOffset, $blockStartPos - $substrOffset);
-
-            if ($nextBlockStartPos !== false && $nextBlockStartPos < $blockEndPos) {
-                $ret .= substr($css, $blockStartPos, $nextBlockStartPos - $blockStartPos);
-                $searchOffset = $nextBlockStartPos;
-            } else {
-                $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1);
-                $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody));
-                $ret .= '{'. $ruleBodyToken .'}';
-                $searchOffset = $blockEndPos + 1;
-            }
-
-            $substrOffset = $searchOffset;
-        }
-
-        $ret .= substr($css, $substrOffset);
-
-        return $ret;
-    }
-
-    /**
-     * Compresses non-group rule bodies.
-     * @param string $body The rule body without curly braces
-     * @return string
-     */
-    private function processRuleBody($body)
-    {
-        $body = trim($body);
-
-        // Remove spaces before the things that should not have spaces before them.
-        $body = preg_replace('/ ([:=,)*\/;\n])/S', '$1', $body);
-
-        // Remove the spaces after the things that should not have spaces after them.
-        $body = preg_replace('/([:=,(*\/!;\n]) /S', '$1', $body);
+			// ! in the first position of the comment means preserve
+			// so push to the preserved tokens keeping the !
+			if ($this->keepImportantComments && strpos($comment, '!') === 0) {
+				$preservedTokenId = $this->registerPreservedToken($comment);
+				// Put new lines before and after /*! important comments
+				$css = str_replace($commentIdString, "\n/*$preservedTokenId*/\n", $css);
+				continue;
+			}
+
+			// # sourceMappingURL= in the first position of the comment means sourcemap
+			// so push to the preserved tokens if {$this->keepSourceMapComment} is truthy.
+			if ($this->keepSourceMapComment && strpos($comment, '# sourceMappingURL=') === 0) {
+				$preservedTokenId = $this->registerPreservedToken($comment);
+				// Add new line before the sourcemap comment
+				$css = str_replace($commentIdString, "\n/*$preservedTokenId*/", $css);
+				continue;
+			}
+
+			// Keep empty comments after child selectors (IE7 hack)
+			// e.g. html >/**/ body
+			if (strlen($comment) === 0 && strpos($css, '>/*'.$commentId) !== false) {
+				$css = str_replace($commentId, $this->registerPreservedToken(''), $css);
+				continue;
+			}
+
+			// in all other cases kill the comment
+			$css = str_replace($commentIdString, '', $css);
+		}
+
+		// Normalize whitespace again
+		$css = preg_replace('/ +/S', ' ', $css);
+
+		return $css;
+	}
+
+	/**
+	 * Finds, minifies & preserves all rule bodies.
+	 * @param string $css the whole stylesheet.
+	 * @return string
+	 */
+	private function processRuleBodies($css)
+	{
+		$ret = '';
+		$searchOffset = $substrOffset = 0;
+
+		while (($blockStartPos = strpos($css, '{', $searchOffset)) !== false) {
+			$blockEndPos = strpos($css, '}', $blockStartPos);
+			$nextBlockStartPos = strpos($css, '{', $blockStartPos + 1);
+			$ret .= substr($css, $substrOffset, $blockStartPos - $substrOffset);
+
+			if ($nextBlockStartPos !== false && $nextBlockStartPos < $blockEndPos) {
+				$ret .= substr($css, $blockStartPos, $nextBlockStartPos - $blockStartPos);
+				$searchOffset = $nextBlockStartPos;
+			} else {
+				$ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1);
+				$ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody));
+				$ret .= '{'. $ruleBodyToken .'}';
+				$searchOffset = $blockEndPos + 1;
+			}
+
+			$substrOffset = $searchOffset;
+		}
+
+		$ret .= substr($css, $substrOffset);
+
+		return $ret;
+	}
+
+	/**
+	 * Compresses non-group rule bodies.
+	 * @param string $body The rule body without curly braces
+	 * @return string
+	 */
+	private function processRuleBody($body)
+	{
+		$body = trim($body);
+
+		// Remove spaces before the things that should not have spaces before them.
+		$body = preg_replace('/ ([:=,)*\/;\n])/S', '$1', $body);
+
+		// Remove the spaces after the things that should not have spaces after them.
+		$body = preg_replace('/([:=,(*\/!;\n]) /S', '$1', $body);
         
-        // Replace multiple semi-colons in a row by a single one
-        $body = preg_replace('/;;+/S', ';', $body);
-
-        // Remove semicolon before closing brace except when:
-        // - The last property is prefixed with a `*` (lte IE7 hack) to avoid issues on Symbian S60 3.x browsers.
-        if (!preg_match('/\*[a-z0-9-]+:[^;]+;$/Si', $body)) {
-            $body = rtrim($body, ';');
-        }
-
-        // Remove important comments inside a rule body (because they make no sense here).
-        if (strpos($body, '/*') !== false) {
-            $body = preg_replace('/\n?\/\*[A-Z0-9_]+\*\/\n?/S', '', $body);
-        }
+		// Replace multiple semi-colons in a row by a single one
+		$body = preg_replace('/;;+/S', ';', $body);
+
+		// Remove semicolon before closing brace except when:
+		// - The last property is prefixed with a `*` (lte IE7 hack) to avoid issues on Symbian S60 3.x browsers.
+		if (!preg_match('/\*[a-z0-9-]+:[^;]+;$/Si', $body)) {
+			$body = rtrim($body, ';');
+		}
+
+		// Remove important comments inside a rule body (because they make no sense here).
+		if (strpos($body, '/*') !== false) {
+			$body = preg_replace('/\n?\/\*[A-Z0-9_]+\*\/\n?/S', '', $body);
+		}
         
-        // Empty rule body? Exit :)
-        if (empty($body)) {
-            return '';
-        }
-
-        // Shorten font-weight values
-        $body = preg_replace(
-            array('/(font-weight:)bold\b/Si', '/(font-weight:)normal\b/Si'),
-            array('${1}700', '${1}400'),
-            $body
-        );
-
-        // Shorten background property
-        $body = preg_replace('/(background:)(?:none|transparent)( !|;|$)/Si', '${1}0 0$2', $body);
-
-        // Shorten opacity IE filter
-        $body = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $body);
-
-        // Shorten colors from rgb(51,102,153) to #336699, rgb(100%,0%,0%) to #ff0000 (sRGB color space)
-        // Shorten colors from hsl(0, 100%, 50%) to #ff0000 (sRGB color space)
-        // This makes it more likely that it'll get further compressed in the next step.
-        $body = preg_replace_callback(
-            '/(rgb|hsl)\(([0-9,.% -]+)\)(.|$)/Si',
-            array($this, 'shortenHslAndRgbToHexCallback'),
-            $body
-        );
-
-        // Shorten colors from #AABBCC to #ABC or shorter color name:
-        // - Look for hex colors which don't have a "=" in front of them (to avoid MSIE filters)
-        $body = preg_replace_callback(
-            '/(?<!=)#([0-9a-f]{3,6})( |,|\)|;|$)/Si',
-            array($this, 'shortenHexColorsCallback'),
-            $body
-        );
-
-        // Shorten long named colors with a shorter HEX counterpart: white -> #fff.
-        // Run at least 2 times to cover most cases
-        $body = preg_replace_callback(
-            array($this->namedToHexColorsRegex, $this->namedToHexColorsRegex),
-            array($this, 'shortenNamedColorsCallback'),
-            $body
-        );
-
-        // Replace positive sign from numbers before the leading space is removed.
-        // +1.2em to 1.2em, +.8px to .8px, +2% to 2%
-        $body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body);
-
-        // shorten ms to s
-        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) {
-            return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s';
-        }, $body);
-
-        // Remove leading zeros from integer and float numbers.
-        // 000.6 to .6, -0.8 to -.8, 0050 to 50, -01.05 to -1.05
-        $body = preg_replace('/([ :,(])(-?)0+([1-9]?\.?\d+)/S', '$1$2$3', $body);
-
-        // Remove trailing zeros from float numbers.
-        // -6.0100em to -6.01em, .0100 to .01, 1.200px to 1.2px
-        $body = preg_replace('/([ :,(])(-?\d?\.\d+?)0+([^\d])/S', '$1$2$3', $body);
-
-        // Remove trailing .0 -> -9.0 to -9
-        $body = preg_replace('/([ :,(])(-?\d+)\.0([^\d])/S', '$1$2$3', $body);
-
-        // Replace 0 length numbers with 0
-        $body = preg_replace('/([ :,(])-?\.?0+([^\d])/S', '${1}0$2', $body);
-
-        // Shorten zero values for safe properties only
-        $body = preg_replace(
-            array(
-                $this->shortenOneZeroesRegex,
-                $this->shortenTwoZeroesRegex,
-                $this->shortenThreeZeroesRegex,
-                $this->shortenFourZeroesRegex
-            ),
-            array(
-                '$1$2:0',
-                '$1$2:$3 0',
-                '$1$2:$3 $4 0',
-                '$1$2:$3 $4 $5 0'
-            ),
-            $body
-        );
-
-        // Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property.
-        $body = preg_replace('/(background-position):0(?: 0){2,3}( !|;|$)/Si', '$1:0 0$2', $body);
-
-        // Shorten suitable shorthand properties with repeated values
-        $body = preg_replace(
-            array(
-                '/(margin|padding|border-(?:width|radius)):('.$this->numRegex.')(?: \2)+( !|;|$)/Si',
-                '/(border-(?:style|color)):([#a-z0-9]+)(?: \2)+( !|;|$)/Si'
-            ),
-            '$1:$2$3',
-            $body
-        );
-        $body = preg_replace(
-            array(
-                '/(margin|padding|border-(?:width|radius)):'.
-                '('.$this->numRegex.') ('.$this->numRegex.') \2 \3( !|;|$)/Si',
-                '/(border-(?:style|color)):([#a-z0-9]+) ([#a-z0-9]+) \2 \3( !|;|$)/Si'
-            ),
-            '$1:$2 $3$4',
-            $body
-        );
-        $body = preg_replace(
-            array(
-                '/(margin|padding|border-(?:width|radius)):'.
-                '('.$this->numRegex.') ('.$this->numRegex.') ('.$this->numRegex.') \3( !|;|$)/Si',
-                '/(border-(?:style|color)):([#a-z0-9]+) ([#a-z0-9]+) ([#a-z0-9]+) \3( !|;|$)/Si'
-            ),
-            '$1:$2 $3 $4$5',
-            $body
-        );
-
-        // Lowercase some common functions that can be values
-        $body = preg_replace_callback(
-            '/(?:attr|blur|brightness|circle|contrast|cubic-bezier|drop-shadow|ellipse|from|grayscale|'.
-            'hsla?|hue-rotate|inset|invert|local|minmax|opacity|perspective|polygon|rgba?|rect|repeat|saturate|sepia|'.
-            'steps|to|url|var|-webkit-gradient|'.
-            '(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|(?:repeating-)?(?:linear|radial)-gradient))\(/Si',
-            array($this, 'strtolowerCallback'),
-            $body
-        );
-
-        // Lowercase all uppercase properties
-        $body = preg_replace_callback('/(?:^|;)[A-Z-]+:/S', array($this, 'strtolowerCallback'), $body);
-
-        return $body;
-    }
-
-    /**
-     * Compresses At-rules and selectors.
-     * @param string $css the whole stylesheet with rule bodies tokenized.
-     * @return string
-     */
-    private function processAtRulesAndSelectors($css)
-    {
-        $charset = '';
-        $imports = '';
-        $namespaces = '';
+		// Empty rule body? Exit :)
+		if (empty($body)) {
+			return '';
+		}
+
+		// Shorten font-weight values
+		$body = preg_replace(
+			array('/(font-weight:)bold\b/Si', '/(font-weight:)normal\b/Si'),
+			array('${1}700', '${1}400'),
+			$body
+		);
+
+		// Shorten background property
+		$body = preg_replace('/(background:)(?:none|transparent)( !|;|$)/Si', '${1}0 0$2', $body);
+
+		// Shorten opacity IE filter
+		$body = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $body);
+
+		// Shorten colors from rgb(51,102,153) to #336699, rgb(100%,0%,0%) to #ff0000 (sRGB color space)
+		// Shorten colors from hsl(0, 100%, 50%) to #ff0000 (sRGB color space)
+		// This makes it more likely that it'll get further compressed in the next step.
+		$body = preg_replace_callback(
+			'/(rgb|hsl)\(([0-9,.% -]+)\)(.|$)/Si',
+			array($this, 'shortenHslAndRgbToHexCallback'),
+			$body
+		);
+
+		// Shorten colors from #AABBCC to #ABC or shorter color name:
+		// - Look for hex colors which don't have a "=" in front of them (to avoid MSIE filters)
+		$body = preg_replace_callback(
+			'/(?<!=)#([0-9a-f]{3,6})( |,|\)|;|$)/Si',
+			array($this, 'shortenHexColorsCallback'),
+			$body
+		);
+
+		// Shorten long named colors with a shorter HEX counterpart: white -> #fff.
+		// Run at least 2 times to cover most cases
+		$body = preg_replace_callback(
+			array($this->namedToHexColorsRegex, $this->namedToHexColorsRegex),
+			array($this, 'shortenNamedColorsCallback'),
+			$body
+		);
+
+		// Replace positive sign from numbers before the leading space is removed.
+		// +1.2em to 1.2em, +.8px to .8px, +2% to 2%
+		$body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body);
+
+		// shorten ms to s
+		$body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) {
+			return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s';
+		}, $body);
+
+		// Remove leading zeros from integer and float numbers.
+		// 000.6 to .6, -0.8 to -.8, 0050 to 50, -01.05 to -1.05
+		$body = preg_replace('/([ :,(])(-?)0+([1-9]?\.?\d+)/S', '$1$2$3', $body);
+
+		// Remove trailing zeros from float numbers.
+		// -6.0100em to -6.01em, .0100 to .01, 1.200px to 1.2px
+		$body = preg_replace('/([ :,(])(-?\d?\.\d+?)0+([^\d])/S', '$1$2$3', $body);
+
+		// Remove trailing .0 -> -9.0 to -9
+		$body = preg_replace('/([ :,(])(-?\d+)\.0([^\d])/S', '$1$2$3', $body);
+
+		// Replace 0 length numbers with 0
+		$body = preg_replace('/([ :,(])-?\.?0+([^\d])/S', '${1}0$2', $body);
+
+		// Shorten zero values for safe properties only
+		$body = preg_replace(
+			array(
+				$this->shortenOneZeroesRegex,
+				$this->shortenTwoZeroesRegex,
+				$this->shortenThreeZeroesRegex,
+				$this->shortenFourZeroesRegex
+			),
+			array(
+				'$1$2:0',
+				'$1$2:$3 0',
+				'$1$2:$3 $4 0',
+				'$1$2:$3 $4 $5 0'
+			),
+			$body
+		);
+
+		// Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property.
+		$body = preg_replace('/(background-position):0(?: 0){2,3}( !|;|$)/Si', '$1:0 0$2', $body);
+
+		// Shorten suitable shorthand properties with repeated values
+		$body = preg_replace(
+			array(
+				'/(margin|padding|border-(?:width|radius)):('.$this->numRegex.')(?: \2)+( !|;|$)/Si',
+				'/(border-(?:style|color)):([#a-z0-9]+)(?: \2)+( !|;|$)/Si'
+			),
+			'$1:$2$3',
+			$body
+		);
+		$body = preg_replace(
+			array(
+				'/(margin|padding|border-(?:width|radius)):'.
+				'('.$this->numRegex.') ('.$this->numRegex.') \2 \3( !|;|$)/Si',
+				'/(border-(?:style|color)):([#a-z0-9]+) ([#a-z0-9]+) \2 \3( !|;|$)/Si'
+			),
+			'$1:$2 $3$4',
+			$body
+		);
+		$body = preg_replace(
+			array(
+				'/(margin|padding|border-(?:width|radius)):'.
+				'('.$this->numRegex.') ('.$this->numRegex.') ('.$this->numRegex.') \3( !|;|$)/Si',
+				'/(border-(?:style|color)):([#a-z0-9]+) ([#a-z0-9]+) ([#a-z0-9]+) \3( !|;|$)/Si'
+			),
+			'$1:$2 $3 $4$5',
+			$body
+		);
+
+		// Lowercase some common functions that can be values
+		$body = preg_replace_callback(
+			'/(?:attr|blur|brightness|circle|contrast|cubic-bezier|drop-shadow|ellipse|from|grayscale|'.
+			'hsla?|hue-rotate|inset|invert|local|minmax|opacity|perspective|polygon|rgba?|rect|repeat|saturate|sepia|'.
+			'steps|to|url|var|-webkit-gradient|'.
+			'(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|(?:repeating-)?(?:linear|radial)-gradient))\(/Si',
+			array($this, 'strtolowerCallback'),
+			$body
+		);
+
+		// Lowercase all uppercase properties
+		$body = preg_replace_callback('/(?:^|;)[A-Z-]+:/S', array($this, 'strtolowerCallback'), $body);
+
+		return $body;
+	}
+
+	/**
+	 * Compresses At-rules and selectors.
+	 * @param string $css the whole stylesheet with rule bodies tokenized.
+	 * @return string
+	 */
+	private function processAtRulesAndSelectors($css)
+	{
+		$charset = '';
+		$imports = '';
+		$namespaces = '';
         
-        // Remove spaces before the things that should not have spaces before them.
-        $css = preg_replace('/ ([@{};>+)\]~=,\/\n])/S', '$1', $css);
+		// Remove spaces before the things that should not have spaces before them.
+		$css = preg_replace('/ ([@{};>+)\]~=,\/\n])/S', '$1', $css);
 
-        // Remove the spaces after the things that should not have spaces after them.
-        $css = preg_replace('/([{}:;>+(\[~=,\/\n]) /S', '$1', $css);
+		// Remove the spaces after the things that should not have spaces after them.
+		$css = preg_replace('/([{}:;>+(\[~=,\/\n]) /S', '$1', $css);
         
-        // Shorten shortable double colon (CSS3) pseudo-elements to single colon (CSS2)
-        $css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css);
-
-        // Retain space for special IE6 cases
-        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) {
-            return ':first-'. strtolower($matches[1]) .' '. $matches[2];
-        }, $css);
-
-        // Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1)
-        // Add token to add the "/" back in later
-        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
-
-        // Remove empty rule blocks up to 2 levels deep.
-        $css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css);
-        $css = preg_replace('/[^{};\/\n]+\{\}/S', '', $css);
-
-        // Two important comments next to each other? Remove extra newline.
-        if ($this->keepImportantComments) {
-            $css = str_replace("\n\n", "\n", $css);
-        }
+		// Shorten shortable double colon (CSS3) pseudo-elements to single colon (CSS2)
+		$css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css);
+
+		// Retain space for special IE6 cases
+		$css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) {
+			return ':first-'. strtolower($matches[1]) .' '. $matches[2];
+		}, $css);
+
+		// Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1)
+		// Add token to add the "/" back in later
+		$css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
+
+		// Remove empty rule blocks up to 2 levels deep.
+		$css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css);
+		$css = preg_replace('/[^{};\/\n]+\{\}/S', '', $css);
+
+		// Two important comments next to each other? Remove extra newline.
+		if ($this->keepImportantComments) {
+			$css = str_replace("\n\n", "\n", $css);
+		}
         
-        // Restore fraction
-        $css = str_replace(self::QUERY_FRACTION, '/', $css);
-
-        // Lowercase some popular @directives
-        $css = preg_replace_callback(
-            '/(?<!\\\\)@(?:charset|document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|'.
-            'namespace|page|supports|viewport)/Si',
-            array($this, 'strtolowerCallback'),
-            $css
-        );
-
-        // Lowercase some popular media types
-        $css = preg_replace_callback(
-            '/[ ,](?:all|aural|braille|handheld|print|projection|screen|tty|tv|embossed|speech)[ ,;{]/Si',
-            array($this, 'strtolowerCallback'),
-            $css
-        );
-
-        // Lowercase some common pseudo-classes & pseudo-elements
-        $css = preg_replace_callback(
-            '/(?<!\\\\):(?:active|after|before|checked|default|disabled|empty|enabled|first-(?:child|of-type)|'.
-            'focus(?:-within)?|hover|indeterminate|in-range|invalid|lang\(|last-(?:child|of-type)|left|link|not\(|'.
-            'nth-(?:child|of-type)\(|nth-last-(?:child|of-type)\(|only-(?:child|of-type)|optional|out-of-range|'.
-            'read-(?:only|write)|required|right|root|:selection|target|valid|visited)/Si',
-            array($this, 'strtolowerCallback'),
-            $css
-        );
+		// Restore fraction
+		$css = str_replace(self::QUERY_FRACTION, '/', $css);
+
+		// Lowercase some popular @directives
+		$css = preg_replace_callback(
+			'/(?<!\\\\)@(?:charset|document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|'.
+			'namespace|page|supports|viewport)/Si',
+			array($this, 'strtolowerCallback'),
+			$css
+		);
+
+		// Lowercase some popular media types
+		$css = preg_replace_callback(
+			'/[ ,](?:all|aural|braille|handheld|print|projection|screen|tty|tv|embossed|speech)[ ,;{]/Si',
+			array($this, 'strtolowerCallback'),
+			$css
+		);
+
+		// Lowercase some common pseudo-classes & pseudo-elements
+		$css = preg_replace_callback(
+			'/(?<!\\\\):(?:active|after|before|checked|default|disabled|empty|enabled|first-(?:child|of-type)|'.
+			'focus(?:-within)?|hover|indeterminate|in-range|invalid|lang\(|last-(?:child|of-type)|left|link|not\(|'.
+			'nth-(?:child|of-type)\(|nth-last-(?:child|of-type)\(|only-(?:child|of-type)|optional|out-of-range|'.
+			'read-(?:only|write)|required|right|root|:selection|target|valid|visited)/Si',
+			array($this, 'strtolowerCallback'),
+			$css
+		);
         
-        // @charset handling
-        if (preg_match($this->charsetRegex, $css, $matches)) {
-            // Keep the first @charset at-rule found
-            $charset = $matches[0];
-            // Delete all @charset at-rules
-            $css = preg_replace($this->charsetRegex, '', $css);
-        }
-
-        // @import handling
-        $css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) {
-            // Keep all @import at-rules found for later
-            $imports .= $matches[0];
-            // Delete all @import at-rules
-            return '';
-        }, $css);
-
-        // @namespace handling
-        $css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) {
-            // Keep all @namespace at-rules found for later
-            $namespaces .= $matches[0];
-            // Delete all @namespace at-rules
-            return '';
-        }, $css);
+		// @charset handling
+		if (preg_match($this->charsetRegex, $css, $matches)) {
+			// Keep the first @charset at-rule found
+			$charset = $matches[0];
+			// Delete all @charset at-rules
+			$css = preg_replace($this->charsetRegex, '', $css);
+		}
+
+		// @import handling
+		$css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) {
+			// Keep all @import at-rules found for later
+			$imports .= $matches[0];
+			// Delete all @import at-rules
+			return '';
+		}, $css);
+
+		// @namespace handling
+		$css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) {
+			// Keep all @namespace at-rules found for later
+			$namespaces .= $matches[0];
+			// Delete all @namespace at-rules
+			return '';
+		}, $css);
         
-        // Order critical at-rules:
-        // 1. @charset first
-        // 2. @imports below @charset
-        // 3. @namespaces below @imports
-        $css = $charset . $imports . $namespaces . $css;
-
-        return $css;
-    }
-
-    /**
-     * Splits long lines after a specific column.
-     *
-     * Some source control tools don't like it when files containing lines longer
-     * than, say 8000 characters, are checked in. The linebreak option is used in
-     * that case to split long lines after a specific column.
-     *
-     * @param string $css the whole stylesheet.
-     * @return string
-     */
-    private function processLongLineSplitting($css)
-    {
-        if ($this->linebreakPosition > 0) {
-            $l = strlen($css);
-            $offset = $this->linebreakPosition;
-            while (preg_match('/(?<!\\\\)\}(?!\n)/S', $css, $matches, PREG_OFFSET_CAPTURE, $offset)) {
-                $matchIndex = $matches[0][1];
-                $css = substr_replace($css, "\n", $matchIndex + 1, 0);
-                $offset = $matchIndex + 2 + $this->linebreakPosition;
-                $l += 1;
-                if ($offset > $l) {
-                    break;
-                }
-            }
-        }
-
-        return $css;
-    }
-
-    /**
-     * Converts hsl() & rgb() colors to HEX format.
-     * @param $matches
-     * @return string
-     */
-    private function shortenHslAndRgbToHexCallback($matches)
-    {
-        $type = $matches[1];
-        $values = explode(',', $matches[2]);
-        $terminator = $matches[3];
+		// Order critical at-rules:
+		// 1. @charset first
+		// 2. @imports below @charset
+		// 3. @namespaces below @imports
+		$css = $charset . $imports . $namespaces . $css;
+
+		return $css;
+	}
+
+	/**
+	 * Splits long lines after a specific column.
+	 *
+	 * Some source control tools don't like it when files containing lines longer
+	 * than, say 8000 characters, are checked in. The linebreak option is used in
+	 * that case to split long lines after a specific column.
+	 *
+	 * @param string $css the whole stylesheet.
+	 * @return string
+	 */
+	private function processLongLineSplitting($css)
+	{
+		if ($this->linebreakPosition > 0) {
+			$l = strlen($css);
+			$offset = $this->linebreakPosition;
+			while (preg_match('/(?<!\\\\)\}(?!\n)/S', $css, $matches, PREG_OFFSET_CAPTURE, $offset)) {
+				$matchIndex = $matches[0][1];
+				$css = substr_replace($css, "\n", $matchIndex + 1, 0);
+				$offset = $matchIndex + 2 + $this->linebreakPosition;
+				$l += 1;
+				if ($offset > $l) {
+					break;
+				}
+			}
+		}
+
+		return $css;
+	}
+
+	/**
+	 * Converts hsl() & rgb() colors to HEX format.
+	 * @param $matches
+	 * @return string
+	 */
+	private function shortenHslAndRgbToHexCallback($matches)
+	{
+		$type = $matches[1];
+		$values = explode(',', $matches[2]);
+		$terminator = $matches[3];
         
-        if ($type === 'hsl') {
-            $values = Utils::hslToRgb($values);
-        }
+		if ($type === 'hsl') {
+			$values = Utils::hslToRgb($values);
+		}
         
-        $hexColors = Utils::rgbToHex($values);
-
-        // Restore space after rgb() or hsl() function in some cases such as:
-        // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%);
-        if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) {
-            $terminator = ' '. $terminator;
-        }
-
-        return '#'. implode('', $hexColors) . $terminator;
-    }
-
-    /**
-     * Compresses HEX color values of the form #AABBCC to #ABC or short color name.
-     * @param $matches
-     * @return string
-     */
-    private function shortenHexColorsCallback($matches)
-    {
-        $hex = $matches[1];
+		$hexColors = Utils::rgbToHex($values);
+
+		// Restore space after rgb() or hsl() function in some cases such as:
+		// background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%);
+		if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) {
+			$terminator = ' '. $terminator;
+		}
+
+		return '#'. implode('', $hexColors) . $terminator;
+	}
+
+	/**
+	 * Compresses HEX color values of the form #AABBCC to #ABC or short color name.
+	 * @param $matches
+	 * @return string
+	 */
+	private function shortenHexColorsCallback($matches)
+	{
+		$hex = $matches[1];
         
-        // Shorten suitable 6 chars HEX colors
-        if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) {
-            $hex = $m[1] . $m[2] . $m[3];
-        }
+		// Shorten suitable 6 chars HEX colors
+		if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) {
+			$hex = $m[1] . $m[2] . $m[3];
+		}
         
-        // Lowercase
-        $hex = '#'. strtolower($hex);
-
-        // Replace Hex colors with shorter color names
-        $color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex;
-
-        return $color . $matches[2];
-    }
-
-    /**
-     * Shortens all named colors with a shorter HEX counterpart for a set of safe properties
-     * e.g. white -> #fff
-     * @param array $matches
-     * @return string
-     */
-    private function shortenNamedColorsCallback($matches)
-    {
-        return $matches[1] . $this->namedToHexColorsMap[strtolower($matches[2])] . $matches[3];
-    }
-
-    /**
-     * Makes a string lowercase
-     * @param array $matches
-     * @return string
-     */
-    private function strtolowerCallback($matches)
-    {
-        return strtolower($matches[0]);
-    }
+		// Lowercase
+		$hex = '#'. strtolower($hex);
+
+		// Replace Hex colors with shorter color names
+		$color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex;
+
+		return $color . $matches[2];
+	}
+
+	/**
+	 * Shortens all named colors with a shorter HEX counterpart for a set of safe properties
+	 * e.g. white -> #fff
+	 * @param array $matches
+	 * @return string
+	 */
+	private function shortenNamedColorsCallback($matches)
+	{
+		return $matches[1] . $this->namedToHexColorsMap[strtolower($matches[2])] . $matches[3];
+	}
+
+	/**
+	 * Makes a string lowercase
+	 * @param array $matches
+	 * @return string
+	 */
+	private function strtolowerCallback($matches)
+	{
+		return strtolower($matches[0]);
+	}
 }

Braces +62 added lines, -30 removed lines

@@ -89,13 +89,15 @@ 
      */
     public function run($css = '')
     {
-        if (empty($css) || !is_string($css)) {
+        if (empty($css) || !is_string($css))
+        {
             return '';
         }
 
         $this->resetRunProperties();
 
-        if ($this->raisePhpLimits) {
+        if ($this->raisePhpLimits)
+        {
             $this->doRaisePhpLimits();
         }
 
@@ -226,20 +228,24 @@ 
         );
 
         // If current settings are higher respect them.
-        foreach ($phpLimits as $name => $suggested) {
+        foreach ($phpLimits as $name => $suggested)
+        {
             $current = Utils::normalizeInt(ini_get($name));
 
-            if ($current >= $suggested) {
+            if ($current >= $suggested)
+            {
                 continue;
             }
 
             // memoryLimit exception: allow -1 for "no memory limit".
-            if ($name === 'memory_limit' && $current === -1) {
+            if ($name === 'memory_limit' && $current === -1)
+            {
                 continue;
             }
 
             // maxExecutionTime exception: allow 0 for "no memory limit".
-            if ($name === 'max_execution_time' && $current === 0) {
+            if ($name === 'max_execution_time' && $current === 0)
+            {
                 continue;
             }
 
@@ -278,7 +284,8 @@ 
      */
     private function registerRuleBodyToken($body)
     {
-        if (empty($body)) {
+        if (empty($body))
+        {
             return '';
         }
 
@@ -370,7 +377,8 @@ 
 
         // Since we need to account for non-base64 data urls, we need to handle
         // ' and ) being part of the data string.
-        while (preg_match('/url\(\s*(["\']?)data:/Si', $css, $m, PREG_OFFSET_CAPTURE, $searchOffset)) {
+        while (preg_match('/url\(\s*(["\']?)data:/Si', $css, $m, PREG_OFFSET_CAPTURE, $searchOffset))
+        {
             $matchStartIndex = $m[0][1];
             $dataStartIndex = $matchStartIndex + 4; // url( length
             $searchOffset = $matchStartIndex + strlen($m[0][0]);
@@ -380,19 +388,23 @@ 
             $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset);
 
             // Terminator found
-            if (preg_match($terminatorRegex, $css, $matches, PREG_OFFSET_CAPTURE, $searchOffset)) {
+            if (preg_match($terminatorRegex, $css, $matches, PREG_OFFSET_CAPTURE, $searchOffset))
+            {
                 $matchEndIndex = $matches[1][1];
                 $searchOffset = $matchEndIndex + 1;
                 $token = substr($css, $dataStartIndex, $matchEndIndex - $dataStartIndex);
 
                 // Remove all spaces only for base64 encoded URLs.
-                if (stripos($token, 'base64,') !== false) {
+                if (stripos($token, 'base64,') !== false)
+                {
                     $token = preg_replace('/\s+/S', '', $token);
                 }
 
                 $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')';
             // No end terminator found, re-add the whole match. Should we throw/warn here?
-            } else {
+            }
+            else
+            {
                 $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex);
             }
 
@@ -437,7 +449,8 @@ 
 
         // maybe the string contains a comment-like substring?
         // one, maybe more? put'em back then
-        if (strpos($match, self::COMMENT_TOKEN_START) !== false) {
+        if (strpos($match, self::COMMENT_TOKEN_START) !== false)
+        {
             $match = strtr($match, $this->comments);
         }
 
@@ -465,12 +478,14 @@ 
      */
     private function processComments($css)
     {
-        foreach ($this->comments as $commentId => $comment) {
+        foreach ($this->comments as $commentId => $comment)
+        {
             $commentIdString = '/*'. $commentId .'*/';
             
             // ! in the first position of the comment means preserve
             // so push to the preserved tokens keeping the !
-            if ($this->keepImportantComments && strpos($comment, '!') === 0) {
+            if ($this->keepImportantComments && strpos($comment, '!') === 0)
+            {
                 $preservedTokenId = $this->registerPreservedToken($comment);
                 // Put new lines before and after /*! important comments
                 $css = str_replace($commentIdString, "\n/*$preservedTokenId*/\n", $css);
@@ -479,7 +494,8 @@ 
 
             // # sourceMappingURL= in the first position of the comment means sourcemap
             // so push to the preserved tokens if {$this->keepSourceMapComment} is truthy.
-            if ($this->keepSourceMapComment && strpos($comment, '# sourceMappingURL=') === 0) {
+            if ($this->keepSourceMapComment && strpos($comment, '# sourceMappingURL=') === 0)
+            {
                 $preservedTokenId = $this->registerPreservedToken($comment);
                 // Add new line before the sourcemap comment
                 $css = str_replace($commentIdString, "\n/*$preservedTokenId*/", $css);
@@ -488,7 +504,8 @@ 
 
             // Keep empty comments after child selectors (IE7 hack)
             // e.g. html >/**/ body
-            if (strlen($comment) === 0 && strpos($css, '>/*'.$commentId) !== false) {
+            if (strlen($comment) === 0 && strpos($css, '>/*'.$commentId) !== false)
+            {
                 $css = str_replace($commentId, $this->registerPreservedToken(''), $css);
                 continue;
             }
@@ -513,15 +530,19 @@ 
         $ret = '';
         $searchOffset = $substrOffset = 0;
 
-        while (($blockStartPos = strpos($css, '{', $searchOffset)) !== false) {
+        while (($blockStartPos = strpos($css, '{', $searchOffset)) !== false)
+        {
             $blockEndPos = strpos($css, '}', $blockStartPos);
             $nextBlockStartPos = strpos($css, '{', $blockStartPos + 1);
             $ret .= substr($css, $substrOffset, $blockStartPos - $substrOffset);
 
-            if ($nextBlockStartPos !== false && $nextBlockStartPos < $blockEndPos) {
+            if ($nextBlockStartPos !== false && $nextBlockStartPos < $blockEndPos)
+            {
                 $ret .= substr($css, $blockStartPos, $nextBlockStartPos - $blockStartPos);
                 $searchOffset = $nextBlockStartPos;
-            } else {
+            }
+            else
+            {
                 $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1);
                 $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody));
                 $ret .= '{'. $ruleBodyToken .'}';
@@ -556,17 +577,20 @@ 
 
         // Remove semicolon before closing brace except when:
         // - The last property is prefixed with a `*` (lte IE7 hack) to avoid issues on Symbian S60 3.x browsers.
-        if (!preg_match('/\*[a-z0-9-]+:[^;]+;$/Si', $body)) {
+        if (!preg_match('/\*[a-z0-9-]+:[^;]+;$/Si', $body))
+        {
             $body = rtrim($body, ';');
         }
 
         // Remove important comments inside a rule body (because they make no sense here).
-        if (strpos($body, '/*') !== false) {
+        if (strpos($body, '/*') !== false)
+        {
             $body = preg_replace('/\n?\/\*[A-Z0-9_]+\*\/\n?/S', '', $body);
         }
         
         // Empty rule body? Exit :)
-        if (empty($body)) {
+        if (empty($body))
+        {
             return '';
         }
 
@@ -729,7 +753,8 @@ 
         $css = preg_replace('/[^{};\/\n]+\{\}/S', '', $css);
 
         // Two important comments next to each other? Remove extra newline.
-        if ($this->keepImportantComments) {
+        if ($this->keepImportantComments)
+        {
             $css = str_replace("\n\n", "\n", $css);
         }
         
@@ -762,7 +787,8 @@ 
         );
         
         // @charset handling
-        if (preg_match($this->charsetRegex, $css, $matches)) {
+        if (preg_match($this->charsetRegex, $css, $matches))
+        {
             // Keep the first @charset at-rule found
             $charset = $matches[0];
             // Delete all @charset at-rules
@@ -806,15 +832,18 @@ 
      */
     private function processLongLineSplitting($css)
     {
-        if ($this->linebreakPosition > 0) {
+        if ($this->linebreakPosition > 0)
+        {
             $l = strlen($css);
             $offset = $this->linebreakPosition;
-            while (preg_match('/(?<!\\\\)\}(?!\n)/S', $css, $matches, PREG_OFFSET_CAPTURE, $offset)) {
+            while (preg_match('/(?<!\\\\)\}(?!\n)/S', $css, $matches, PREG_OFFSET_CAPTURE, $offset))
+            {
                 $matchIndex = $matches[0][1];
                 $css = substr_replace($css, "\n", $matchIndex + 1, 0);
                 $offset = $matchIndex + 2 + $this->linebreakPosition;
                 $l += 1;
-                if ($offset > $l) {
+                if ($offset > $l)
+                {
                     break;
                 }
             }
@@ -834,7 +863,8 @@ 
         $values = explode(',', $matches[2]);
         $terminator = $matches[3];
         
-        if ($type === 'hsl') {
+        if ($type === 'hsl')
+        {
             $values = Utils::hslToRgb($values);
         }
         
@@ -842,7 +872,8 @@ 
 
         // Restore space after rgb() or hsl() function in some cases such as:
         // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%);
-        if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) {
+        if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator))
+        {
             $terminator = ' '. $terminator;
         }
 
@@ -859,7 +890,8 @@ 
         $hex = $matches[1];
         
         // Shorten suitable 6 chars HEX colors
-        if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) {
+        if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m))
+        {
             $hex = $m[1] . $m[2] . $m[3];
         }
         

Spacing +34 added lines, -34 removed lines

@@ -173,8 +173,8 @@ 
      */
     private function setShortenZeroValuesRegexes()
     {
-        $zeroRegex = '0'. $this->unitsGroupRegex;
-        $numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) ';
+        $zeroRegex = '0' . $this->unitsGroupRegex;
+        $numOrPosRegex = '(' . $this->numRegex . '|top|left|bottom|right|center) ';
         $oneZeroSafeProperties = array(
             '(?:line-)?height',
             '(?:(?:min|max)-)?width',
@@ -192,7 +192,7 @@ 
         );
 
         // First zero regex
-        $regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si';
+        $regex = '/(^|;)(' . implode('|', $oneZeroSafeProperties) . '):%s/Si';
         $this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex);
 
         // Multiple zeroes regexes
@@ -321,7 +321,7 @@ 
 
         // Process strings so their content doesn't get accidentally minified
         $css = preg_replace_callback(
-            '/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S",
+            '/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|' . "(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S",
             array($this, 'processStringsCallback'),
             $css
         );
@@ -375,7 +375,7 @@ 
             $dataStartIndex = $matchStartIndex + 4; // url( length
             $searchOffset = $matchStartIndex + strlen($m[0][0]);
             $terminator = $m[1][0]; // ', " or empty (not quoted)
-            $terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S';
+            $terminatorRegex = '/(?<!\\\\)' . (strlen($terminator) === 0 ? '' : $terminator . '\s*') . '(\))/S';
             
             $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset);
 
@@ -390,7 +390,7 @@ 
                     $token = preg_replace('/\s+/S', '', $token);
                 }
 
-                $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')';
+                $ret .= 'url(' . $this->registerPreservedToken(trim($token)) . ')';
             // No end terminator found, re-add the whole match. Should we throw/warn here?
             } else {
                 $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex);
@@ -411,7 +411,7 @@ 
      */
     private function processCommentsCallback($matches)
     {
-        return '/*'. $this->registerCommentToken($matches[1]) .'*/';
+        return '/*' . $this->registerCommentToken($matches[1]) . '*/';
     }
 
     /**
@@ -421,7 +421,7 @@ 
      */
     private function processOldIeSpecificMatrixDefinitionCallback($matches)
     {
-        return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')';
+        return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . $this->registerPreservedToken($matches[1]) . ')';
     }
 
     /**
@@ -455,7 +455,7 @@ 
      */
     private function processImportUnquotedUrlAtRulesCallback($matches)
     {
-        return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2];
+        return '@import url(' . $this->registerPreservedToken($matches[1]) . ')' . $matches[2];
     }
 
     /**
@@ -466,7 +466,7 @@ 
     private function processComments($css)
     {
         foreach ($this->comments as $commentId => $comment) {
-            $commentIdString = '/*'. $commentId .'*/';
+            $commentIdString = '/*' . $commentId . '*/';
             
             // ! in the first position of the comment means preserve
             // so push to the preserved tokens keeping the !
@@ -488,7 +488,7 @@ 
 
             // Keep empty comments after child selectors (IE7 hack)
             // e.g. html >/**/ body
-            if (strlen($comment) === 0 && strpos($css, '>/*'.$commentId) !== false) {
+            if (strlen($comment) === 0 && strpos($css, '>/*' . $commentId) !== false) {
                 $css = str_replace($commentId, $this->registerPreservedToken(''), $css);
                 continue;
             }
@@ -524,7 +524,7 @@ 
             } else {
                 $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1);
                 $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody));
-                $ret .= '{'. $ruleBodyToken .'}';
+                $ret .= '{' . $ruleBodyToken . '}';
                 $searchOffset = $blockEndPos + 1;
             }
 
@@ -613,8 +613,8 @@ 
         $body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body);
 
         // shorten ms to s
-        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) {
-            return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s';
+        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function($matches) {
+            return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) . 's';
         }, $body);
 
         // Remove leading zeros from integer and float numbers.
@@ -654,7 +654,7 @@ 
         // Shorten suitable shorthand properties with repeated values
         $body = preg_replace(
             array(
-                '/(margin|padding|border-(?:width|radius)):('.$this->numRegex.')(?: \2)+( !|;|$)/Si',
+                '/(margin|padding|border-(?:width|radius)):(' . $this->numRegex . ')(?: \2)+( !|;|$)/Si',
                 '/(border-(?:style|color)):([#a-z0-9]+)(?: \2)+( !|;|$)/Si'
             ),
             '$1:$2$3',
@@ -662,8 +662,8 @@ 
         );
         $body = preg_replace(
             array(
-                '/(margin|padding|border-(?:width|radius)):'.
-                '('.$this->numRegex.') ('.$this->numRegex.') \2 \3( !|;|$)/Si',
+                '/(margin|padding|border-(?:width|radius)):' .
+                '(' . $this->numRegex . ') (' . $this->numRegex . ') \2 \3( !|;|$)/Si',
                 '/(border-(?:style|color)):([#a-z0-9]+) ([#a-z0-9]+) \2 \3( !|;|$)/Si'
             ),
             '$1:$2 $3$4',
@@ -671,8 +671,8 @@ 
         );
         $body = preg_replace(
             array(
-                '/(margin|padding|border-(?:width|radius)):'.
-                '('.$this->numRegex.') ('.$this->numRegex.') ('.$this->numRegex.') \3( !|;|$)/Si',
+                '/(margin|padding|border-(?:width|radius)):' .
+                '(' . $this->numRegex . ') (' . $this->numRegex . ') (' . $this->numRegex . ') \3( !|;|$)/Si',
                 '/(border-(?:style|color)):([#a-z0-9]+) ([#a-z0-9]+) ([#a-z0-9]+) \3( !|;|$)/Si'
             ),
             '$1:$2 $3 $4$5',
@@ -681,9 +681,9 @@ 
 
         // Lowercase some common functions that can be values
         $body = preg_replace_callback(
-            '/(?:attr|blur|brightness|circle|contrast|cubic-bezier|drop-shadow|ellipse|from|grayscale|'.
-            'hsla?|hue-rotate|inset|invert|local|minmax|opacity|perspective|polygon|rgba?|rect|repeat|saturate|sepia|'.
-            'steps|to|url|var|-webkit-gradient|'.
+            '/(?:attr|blur|brightness|circle|contrast|cubic-bezier|drop-shadow|ellipse|from|grayscale|' .
+            'hsla?|hue-rotate|inset|invert|local|minmax|opacity|perspective|polygon|rgba?|rect|repeat|saturate|sepia|' .
+            'steps|to|url|var|-webkit-gradient|' .
             '(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|(?:repeating-)?(?:linear|radial)-gradient))\(/Si',
             array($this, 'strtolowerCallback'),
             $body
@@ -716,13 +716,13 @@ 
         $css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css);
 
         // Retain space for special IE6 cases
-        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) {
-            return ':first-'. strtolower($matches[1]) .' '. $matches[2];
+        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function($matches) {
+            return ':first-' . strtolower($matches[1]) . ' ' . $matches[2];
         }, $css);
 
         // Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1)
         // Add token to add the "/" back in later
-        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
+        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2' . self::QUERY_FRACTION . '$3)', $css);
 
         // Remove empty rule blocks up to 2 levels deep.
         $css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css);
@@ -738,7 +738,7 @@ 
 
         // Lowercase some popular @directives
         $css = preg_replace_callback(
-            '/(?<!\\\\)@(?:charset|document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|'.
+            '/(?<!\\\\)@(?:charset|document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|' .
             'namespace|page|supports|viewport)/Si',
             array($this, 'strtolowerCallback'),
             $css
@@ -753,9 +753,9 @@ 
 
         // Lowercase some common pseudo-classes & pseudo-elements
         $css = preg_replace_callback(
-            '/(?<!\\\\):(?:active|after|before|checked|default|disabled|empty|enabled|first-(?:child|of-type)|'.
-            'focus(?:-within)?|hover|indeterminate|in-range|invalid|lang\(|last-(?:child|of-type)|left|link|not\(|'.
-            'nth-(?:child|of-type)\(|nth-last-(?:child|of-type)\(|only-(?:child|of-type)|optional|out-of-range|'.
+            '/(?<!\\\\):(?:active|after|before|checked|default|disabled|empty|enabled|first-(?:child|of-type)|' .
+            'focus(?:-within)?|hover|indeterminate|in-range|invalid|lang\(|last-(?:child|of-type)|left|link|not\(|' .
+            'nth-(?:child|of-type)\(|nth-last-(?:child|of-type)\(|only-(?:child|of-type)|optional|out-of-range|' .
             'read-(?:only|write)|required|right|root|:selection|target|valid|visited)/Si',
             array($this, 'strtolowerCallback'),
             $css
@@ -770,7 +770,7 @@ 
         }
 
         // @import handling
-        $css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) {
+        $css = preg_replace_callback($this->importRegex, function($matches) use (&$imports) {
             // Keep all @import at-rules found for later
             $imports .= $matches[0];
             // Delete all @import at-rules
@@ -778,7 +778,7 @@ 
         }, $css);
 
         // @namespace handling
-        $css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) {
+        $css = preg_replace_callback($this->namespaceRegex, function($matches) use (&$namespaces) {
             // Keep all @namespace at-rules found for later
             $namespaces .= $matches[0];
             // Delete all @namespace at-rules
@@ -843,10 +843,10 @@ 
         // Restore space after rgb() or hsl() function in some cases such as:
         // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%);
         if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) {
-            $terminator = ' '. $terminator;
+            $terminator = ' ' . $terminator;
         }
 
-        return '#'. implode('', $hexColors) . $terminator;
+        return '#' . implode('', $hexColors) . $terminator;
     }
 
     /**
@@ -864,7 +864,7 @@ 
         }
         
         // Lowercase
-        $hex = '#'. strtolower($hex);
+        $hex = '#' . strtolower($hex);
 
         // Replace Hex colors with shorter color names
         $color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex;