From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 10 Aug 2018 20:03:01 +0000 (+0100)
Subject: JavaScriptMinifier: Add test case for T201606
X-Git-Tag: 1.34.0-rc.0~4498^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=53e05f7b9c88d12cdd3e7d96b874e5979c9d5d40;p=lhc%2Fweb%2Fwiklou.git

JavaScriptMinifier: Add test case for T201606

Bug: T201606
Change-Id: I2058765c7f1cfb9e2d644f19e780926d01b9b68c
---

diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index 61056784fb..03a4438641 100644
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -203,6 +203,33 @@ class JavaScriptMinifierTest extends PHPUnit\Framework\TestCase {
 		);
 	}
 
+	/**
+	 * @covers JavaScriptMinifier::minify
+	 */
+	public function testReturnLineBreak() {
+		// Regression test for T201606.
+		$lineFill = str_repeat( 'x', 993 );
+		$code = <<<JAVASCRIPT
+call( function () {
+	try {
+	} catch (e) {
+		push = {
+			apply: 1 ? 0 : {}
+		};
+	}
+	{$lineFill}
+	return name === 'input';
+} );
+JAVASCRIPT;
+		$this->assertSame(
+			"call(function(){try{}catch(e){push={apply:1?0:{}};}"
+				// FIXME: Token `name` must be on line 2 instead of line 3
+				. "\n$lineFill return"
+				. "\nname==='input';});",
+			JavaScriptMinifier::minify( $code )
+		);
+	}
+
 	public static function provideExponentLineBreaking() {
 		return [
 			[