From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 18 Dec 2018 05:45:41 +0000 (+0000)
Subject: Merge "Use our fork of less.php" into REL1_31
X-Git-Tag: 1.31.2~51
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=ebc5cca3181d19c4ed488ba78cd3a39446dcb055;hp=be5735b6942870ef5e0afd64eff908a72710b735

Merge "Use our fork of less.php" into REL1_31
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index d76ecd49a8..0368488b71 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -21,6 +21,7 @@ THIS IS NOT A RELEASE YET
   * Suppress "Headers already sent" in PHP 7.2 too
   * (T206476) Output only to stderr in unit tests
   * (T207112) Add session_write_close() calls to SessionManager tests
+  * oyejorge/less.php replaced with our fork wikimedia/less.php
 * (T207540) Include IP address in "Login for $1 succeeded" log entry.
 * (T201781) Database: Allow selectFieldValues() to accept SQL fragments
 * (T205765) installer: Don't link to the obsolete "Extension Matrix" page
diff --git a/composer.json b/composer.json
index 753518340f..b884c543e9 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,6 @@
 		"ext-xml": "*",
 		"liuggio/statsd-php-client": "1.0.18",
 		"oojs/oojs-ui": "v0.26.4",
-		"oyejorge/less.php": "1.7.0.14",
 		"pear/mail": "1.4.1",
 		"pear/mail_mime": "1.10.2",
 		"pear/net_smtp": "1.7.3",
@@ -40,6 +39,7 @@
 		"wikimedia/composer-merge-plugin": "1.4.1",
 		"wikimedia/html-formatter": "1.0.2",
 		"wikimedia/ip-set": "1.2.0",
+		"wikimedia/less.php": "1.8.0",
 		"wikimedia/object-factory": "1.0.0",
 		"wikimedia/php-session-serializer": "1.0.6",
 		"wikimedia/purtle": "1.0.7",