From: Reedy <reedy@wikimedia.org>
Date: Tue, 12 Feb 2019 01:25:12 +0000 (+0000)
Subject: Update wikimedia/at-ease from 1.2.0 to 2.0.0
X-Git-Tag: 1.34.0-rc.0~1667
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=0517b9af9b6bd47e760b06db6af1c6b4e7c2b9f8;p=lhc%2Fweb%2Fwiklou.git

Update wikimedia/at-ease from 1.2.0 to 2.0.0

https://github.com/wikimedia/at-ease/releases/tag/v2.0.0
https://github.com/wikimedia/at-ease/compare/v1.2.0...v2.0.0

Change-Id: Ia49a156e76d0a4e257e91cc6a51050848bcb9a5e
Depends-On: If40364e2590e3c23035838f8ed26c4f69e730602
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 09d56c8de0..d9ac7bf08f 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -59,6 +59,7 @@ For notes on 1.33.x and older releases, see HISTORY.
 * Updated composer/spdx-licenses from 1.4.0 to 1.5.1 (dev-only).
 * Updated mediawiki/codesniffer from 25.0.0 to 26.0.0 (dev-only).
 * Updated cssjanus/cssjanus from 1.2.1 to 1.3.0.
+* Updated wikimedia/at-ease from 1.2.0 to 2.0.0.
 * …
 
 ==== Removed external libraries ====
diff --git a/composer.json b/composer.json
index b1242c5d62..11680ff7ab 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
 		"php": ">=5.6.99",
 		"psr/log": "1.0.2",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/at-ease": "1.2.0",
+		"wikimedia/at-ease": "2.0.0",
 		"wikimedia/base-convert": "2.0.0",
 		"wikimedia/cdb": "1.4.1",
 		"wikimedia/cldr-plural-rule-parser": "1.0.0",
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b246a7ba66..7256eab2fb 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -32,6 +32,7 @@ use MediaWiki\Session\SessionManager;
 use MediaWiki\Shell\Shell;
 use Wikimedia\ScopedCallback;
 use Wikimedia\WrappedString;
+use Wikimedia\AtEase\AtEase;
 
 /**
  * Load an extension
@@ -799,9 +800,9 @@ function wfParseUrl( $url ) {
 	if ( $wasRelative ) {
 		$url = "http:$url";
 	}
-	Wikimedia\suppressWarnings();
+	AtEase::suppressWarnings();
 	$bits = parse_url( $url );
-	Wikimedia\restoreWarnings();
+	AtEase::restoreWarnings();
 	// parse_url() returns an array without scheme for some invalid URLs, e.g.
 	// parse_url("%0Ahttp://example.com") == [ 'host' => '%0Ahttp', 'path' => 'example.com' ]
 	if ( !$bits || !isset( $bits['scheme'] ) ) {
@@ -1972,9 +1973,9 @@ function wfMkdirParents( $dir, $mode = null, $caller = null ) {
 	}
 
 	// Turn off the normal warning, we're doing our own below
-	Wikimedia\suppressWarnings();
+	AtEase::suppressWarnings();
 	$ok = mkdir( $dir, $mode, true ); // PHP5 <3
-	Wikimedia\restoreWarnings();
+	AtEase::restoreWarnings();
 
 	if ( !$ok ) {
 		// directory may have been created on another request since we last checked
@@ -2212,9 +2213,9 @@ function wfMerge( $old, $mine, $yours, &$result, &$mergeAttemptResult = null ) {
 
 	# This check may also protect against code injection in
 	# case of broken installations.
-	Wikimedia\suppressWarnings();
+	AtEase::suppressWarnings();
 	$haveDiff3 = $wgDiff3 && file_exists( $wgDiff3 );
-	Wikimedia\restoreWarnings();
+	AtEase::restoreWarnings();
 
 	if ( !$haveDiff3 ) {
 		wfDebug( "diff3 not found\n" );
@@ -2296,9 +2297,9 @@ function wfDiff( $before, $after, $params = '-u' ) {
 	}
 
 	global $wgDiff;
-	Wikimedia\suppressWarnings();
+	AtEase::suppressWarnings();
 	$haveDiff = $wgDiff && file_exists( $wgDiff );
-	Wikimedia\restoreWarnings();
+	AtEase::restoreWarnings();
 
 	# This check may also protect against code injection in
 	# case of broken installations.
@@ -2474,7 +2475,7 @@ function wfSetupSession( $sessionId = false ) {
 	if ( session_id() !== $session->getId() ) {
 		session_id( $session->getId() );
 	}
-	Wikimedia\quietCall( 'session_start' );
+	AtEase::quietCall( 'session_start' );
 }
 
 /**
diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 109097ae86..20b94459cb 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -26,6 +26,7 @@ use MediaWiki\ShellDisabledError;
 use Profiler;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
+use Wikimedia\AtEase\AtEase;
 
 /**
  * Class used for executing shell commands
@@ -431,9 +432,9 @@ class Command {
 			// TODO replace with clear_last_error when requirements are bumped to PHP7
 			set_error_handler( function () {
 			}, 0 );
-			\Wikimedia\suppressWarnings();
+			AtEase::suppressWarnings();
 			trigger_error( '' );
-			\Wikimedia\restoreWarnings();
+			AtEase::restoreWarnings();
 			restore_error_handler();
 
 			$readPipes = array_filter( $pipes, function ( $fd ) use ( $desc ) {