From fe9076c3c8c00fd3bdc06696d55a062f0cc2da64 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 2 Dec 2010 19:49:54 +0000 Subject: [PATCH] Broke and split up many long lines --- includes/libs/CSSMin.php | 69 ++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 24 deletions(-) diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php index 7271b36390..bdb6008363 100644 --- a/includes/libs/CSSMin.php +++ b/includes/libs/CSSMin.php @@ -2,13 +2,15 @@ /* * Copyright 2010 Wikimedia Foundation * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + * OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ @@ -30,8 +32,8 @@ class CSSMin { /** * Maximum file size to still qualify for in-line embedding as a data-URI * - * 24,576 is used because Internet Explorer has a 32,768 byte limit for data URIs, which when base64 encoded will - * result in a 1/3 increase in size. + * 24,576 is used because Internet Explorer has a 32,768 byte limit for data URIs, + * which when base64 encoded will result in a 1/3 increase in size. */ const EMBED_SIZE_LIMIT = 24576; const URL_REGEX = 'url\([\'"]?(?P[^\?\)\:\'"]*)\??[^\)\'"]*[\'"]?\)'; @@ -61,9 +63,12 @@ class CSSMin { */ public static function getLocalFileReferences( $source, $path = null ) { $files = array(); - if ( preg_match_all( '/' . self::URL_REGEX . '/', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER ) ) { + $rFlags = PREG_OFFSET_CAPTURE | PREG_SET_ORDER; + if ( preg_match_all( '/' . self::URL_REGEX . '/', $source, $matches, $rFlags ) ) { foreach ( $matches as $match ) { - $file = ( isset( $path ) ? rtrim( $path, '/' ) . '/' : '' ) . "{$match['file'][0]}"; + $file = ( isset( $path ) + ? rtrim( $path, '/' ) . '/' + : '' ) . "{$match['file'][0]}"; // Only proceed if we can access the file if ( !is_null( $path ) && file_exists( $file ) ) { @@ -75,7 +80,8 @@ class CSSMin { } /** - * Remaps CSS URL paths and automatically embeds data URIs for URL rules preceded by an /* @embed * / comment + * Remaps CSS URL paths and automatically embeds data URIs for URL rules + * preceded by an /* @embed * / comment * * @param $source string CSS data to remap * @param $local string File path where the source was read from @@ -84,7 +90,8 @@ class CSSMin { * @return string Remapped CSS data */ public static function remap( $source, $local, $remote, $embed = true ) { - $pattern = '/((?P\s*\/\*\s*\@embed\s*\*\/)(?P
[^\;\}]*))?' . self::URL_REGEX . '(?P[^;]*)[\;]?/';
+		$pattern = '/((?P\s*\/\*\s*\@embed\s*\*\/)(?P
[^\;\}]*))?' .
+			self::URL_REGEX . '(?P[^;]*)[\;]?/';
 		$offset = 0;
 		while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) {
 			// Shortcuts
@@ -95,40 +102,54 @@ class CSSMin {
 			$url = "{$remote}/{$match['file'][0]}";
 			// Only proceed if we can access the file
 			if ( file_exists( $file ) ) {
-				// Add version parameter as a time-stamp in ISO 8601 format, using Z for the timezone, meaning GMT
+				// Add version parameter as a time-stamp in ISO 8601 format,
+				// using Z for the timezone, meaning GMT
 				$url .= '?' . gmdate( 'Y-m-d\TH:i:s\Z', round( filemtime( $file ), -2 ) );
 				// If we the mime-type can't be determined, no embedding will take place
 				$type = false;
 				$realpath = realpath( $file );
-				// Try a couple of different ways to get the mime-type of a file, in order of preference
-				if ( $realpath && function_exists( 'finfo_file' ) && function_exists( 'finfo_open' ) ) {
-					// As of PHP 5.3, this is how you get the mime-type of a file; it uses the Fileinfo PECL extension
+				// Try a couple of different ways to get the mime-type of a file,
+				// in order of preference
+				if ( $realpath
+					&& function_exists( 'finfo_file' ) && function_exists( 'finfo_open' ) )
+				{
+					// As of PHP 5.3, this is how you get the mime-type of a file;
+					// it uses the Fileinfo PECL extension
 					$type = finfo_file( finfo_open( FILEINFO_MIME_TYPE ), $realpath );
 				} else if ( function_exists( 'mime_content_type' ) ) {
-					// Before this was deprecated in PHP 5.3, this used to be how you get the mime-type of a file
+					// Before this was deprecated in PHP 5.3,
+					// this used to be how you get the mime-type of a file
 					$type = mime_content_type( $file );
 				} else {
-					// Worst-case scenario has happend, use the file extension to infer the mime-type
+					// Worst-case scenario has happend,
+					// use the file extension to infer the mime-type
 					$ext = strtolower( pathinfo( $file, PATHINFO_EXTENSION ) );
 					if ( isset( self::$mimeTypes[$ext] ) ) {
 						$type = self::$mimeTypes[$ext];
 					}
 				}
-				// Detect when URLs were preceeded with embed tags, and also verify file size is below the limit
-				if ( $embed && $type && $match['embed'][1] > 0 && filesize( $file ) < self::EMBED_SIZE_LIMIT ) {
+				// Detect when URLs were preceeded with embed tags,
+				// and also verify file size is below the limit
+				if ( $embed && $type && $match['embed'][1] > 0
+					&& filesize( $file ) < self::EMBED_SIZE_LIMIT )
+				{
 					// Strip off any trailing = symbols (makes browsers freak out)
 					$data = base64_encode( file_get_contents( $file ) );
-					// Build 2 CSS properties; one which uses a base64 encoded data URI in place of the @embed
-					// comment to try and retain line-number integrity , and the other with a remapped an versioned
-					// URL and an Internet Explorer hack making it ignored in all browsers that support data URIs
-					$replacement = "{$pre}url(data:{$type};base64,{$data}){$post};{$pre}url({$url}){$post}!ie;";
+					// Build 2 CSS properties; one which uses a base64 encoded data URI
+					// in place of the @embed comment to try and retain line-number integrity,
+					// and the other with a remapped an versioned URL and an Internet Explorer
+					// hack making it ignored in all browsers that support data URIs
+					$replacement = "{$pre}url(data:{$type};base64,{$data}){$post};";
+					$replacement .= "{$pre}url({$url}){$post}!ie;";
 				} else {
-					// Build a CSS property with a remapped and versioned URL, preserving comment for debug mode
+					// Build a CSS property with a remapped and versioned URL,
+					// preserving comment for debug mode
 					$replacement = "{$embed}{$pre}url({$url}){$post};";
 				}
 
 				// Perform replacement on the source
-				$source = substr_replace( $source, $replacement, $match[0][1], strlen( $match[0][0] ) );
+				$source = substr_replace( $source,
+					$replacement, $match[0][1], strlen( $match[0][0] ) );
 				// Move the offset to the end of the replacement in the source
 				$offset = $match[0][1] + strlen( $replacement );
 				continue;
-- 
2.20.1