From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 27 Sep 2013 20:35:16 +0000 (+0000)
Subject: Merge "CSSJanus: Support text-shadow and box-shadow flipping"
X-Git-Tag: 1.31.0-rc.0~18666
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=edba2e008c079f4d51abc70f2c98c1dc8009a900;hp=d2ad05aae9e6d931dc138b7d8cdc39758b77b318;p=lhc%2Fweb%2Fwiklou.git

Merge "CSSJanus: Support text-shadow and box-shadow flipping"
---

diff --git a/includes/libs/CSSJanus.php b/includes/libs/CSSJanus.php
index 128d9b9031..5a52fc7c27 100644
--- a/includes/libs/CSSJanus.php
+++ b/includes/libs/CSSJanus.php
@@ -77,6 +77,9 @@ class CSSJanus {
 		'four_notation_quantity' => null,
 		'four_notation_color' => null,
 		'border_radius' => null,
+		'box_shadow' => null,
+		'text_shadow1' => null,
+		'text_shadow2' => null,
 		'bg_horizontal_percentage' => null,
 		'bg_horizontal_percentage_x' => null,
 	);
@@ -117,6 +120,9 @@ class CSSJanus {
 		$patterns['four_notation_quantity'] = "/(:\s*){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s*[;}])/i";
 		$patterns['four_notation_color'] = "/(-color\s*:\s*){$patterns['color']}(\s+){$patterns['color']}(\s+){$patterns['color']}(\s+){$patterns['color']}(\s*[;}])/i";
 		$patterns['border_radius'] = "/(border-radius\s*:\s*){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s*[;}])/i";
+		$patterns['box_shadow'] = "/(box-shadow\s*:\s*(?:inset\s*)?){$patterns['possibly_negative_quantity']}/i";
+		$patterns['text_shadow1'] = "/(text-shadow\s*:\s*){$patterns['color']}(\s*){$patterns['possibly_negative_quantity']}/i";
+		$patterns['text_shadow2'] = "/(text-shadow\s*:\s*){$patterns['possibly_negative_quantity']}/i";
 		// The two regexes below are parenthesized differently then in the original implementation to make the
 		// callback's job more straightforward
 		$patterns['bg_horizontal_percentage'] = "/(background(?:-position)?\s*:\s*[^%]*?)(-?{$patterns['num']})(%\s*(?:{$patterns['quantity']}|{$patterns['ident']}))/";
@@ -164,6 +170,7 @@ class CSSJanus {
 		$css = self::fixFourPartNotation( $css );
 		$css = self::fixBorderRadius( $css );
 		$css = self::fixBackgroundPosition( $css );
+		$css = self::fixShadows( $css );
 
 		// Detokenize stuff we tokenized before
 		$css = $comments->detokenize( $css );
@@ -262,7 +269,6 @@ class CSSJanus {
 	private static function fixFourPartNotation( $css ) {
 		$css = preg_replace( self::$patterns['four_notation_quantity'], '$1$2$3$8$5$6$7$4$9', $css );
 		$css = preg_replace( self::$patterns['four_notation_color'], '$1$2$3$8$5$6$7$4$9', $css );
-
 		return $css;
 	}
 
@@ -282,6 +288,41 @@ class CSSJanus {
 		return $css;
 	}
 
+	/**
+	 * Negates horizontal offset in box-shadow and text-shadow rules.
+	 *
+	 * @param $css string
+	 * @return string
+	 */
+	private static function fixShadows( $css ) {
+		// Flips the sign of a CSS value, possibly with a unit.
+		// (We can't just negate the value with unary minus due to the units.)
+		$flipSign = function ( $cssValue ) {
+			// Don't mangle zeroes
+			if ( intval( $cssValue ) === 0 ) {
+				return $cssValue;
+			} elseif ( $cssValue[0] === '-' ) {
+				return substr( $cssValue, 1 );
+			} else {
+				return "-" . $cssValue;
+			}
+		};
+
+		$css = preg_replace_callback( self::$patterns['box_shadow'], function ( $matches ) use ( $flipSign ) {
+			return $matches[1] . $flipSign( $matches[2] );
+		}, $css );
+
+		$css = preg_replace_callback( self::$patterns['text_shadow1'], function ( $matches ) use ( $flipSign ) {
+			return $matches[1] . $matches[2] . $matches[3] . $flipSign( $matches[4] );
+		}, $css );
+
+		$css = preg_replace_callback( self::$patterns['text_shadow2'], function ( $matches ) use ( $flipSign ) {
+			return $matches[1] . $flipSign( $matches[2] );
+		}, $css );
+
+		return $css;
+	}
+
 	/**
 	 * Flip horizontal background percentages.
 	 * @param $css string
diff --git a/tests/phpunit/includes/libs/CSSJanusTest.php b/tests/phpunit/includes/libs/CSSJanusTest.php
index d80a571c07..1c898f021c 100644
--- a/tests/phpunit/includes/libs/CSSJanusTest.php
+++ b/tests/phpunit/includes/libs/CSSJanusTest.php
@@ -196,6 +196,28 @@ class CSSJanusTest extends MediaWikiTestCase {
 				'.foo { padding: 1px; }'
 			),
 
+			// text-shadow and box-shadow
+			array(
+				'.foo { box-shadow: -6px 3px 8px 5px rgba(0, 0, 0, 0.25); }',
+				'.foo { box-shadow: 6px 3px 8px 5px rgba(0, 0, 0, 0.25); }',
+			),
+			array(
+				'.foo { box-shadow: inset -6px 3px 8px 5px rgba(0, 0, 0, 0.25); }',
+				'.foo { box-shadow: inset 6px 3px 8px 5px rgba(0, 0, 0, 0.25); }',
+			),
+			array(
+				'.foo { text-shadow: orange 2px 0; }',
+				'.foo { text-shadow: orange -2px 0; }',
+			),
+			array(
+				'.foo { text-shadow: 2px 0 orange; }',
+				'.foo { text-shadow: -2px 0 orange; }',
+			),
+			array(
+				// Don't mangle zeroes
+				'.foo { text-shadow: orange 0 2px; }'
+			),
+
 			// Direction
 			// Note: This differs from the Python implementation,
 			// see also CSSJanus::fixDirection for more info.