Replace use of deprecated Status methods

(as well as a really out-of-place serialize())

Change-Id: I13a8356c6034b3c7d04e0aaa17949229ec2d0409

Author: MatmaRex

ServiceWiring.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\Cache\RevisionLocalCache;
 use MediaWiki\Extension\Notifications\Cache\TitleLocalCache;
@@ -39,8 +40,9 @@
 	): NotificationServiceClient {
 		$echoConfig = $services->getConfigFactory()->makeConfig( 'Echo' );
 		$httpRequestFactory = $services->getHttpRequestFactory();
+		$statusFormatter = $services->getFormatterFactory()->getStatusFormatter( RequestContext::getMain() );
 		$url = $echoConfig->get( 'EchoPushServiceBaseUrl' );
-		$client = new NotificationServiceClient( $httpRequestFactory, $url );
+		$client = new NotificationServiceClient( $httpRequestFactory, $statusFormatter, $url );
 		$client->setLogger( LoggerFactory::getInstance( 'Echo' ) );
 		return $client;
 	},

includes/Push/NotificationServiceClient.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Extension\Notifications\Push;
 
 use MediaWiki\Http\HttpRequestFactory;
-use MediaWiki\Status\Status;
+use MediaWiki\Status\StatusFormatter;
 use MWHttpRequest;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
@@ -15,15 +15,24 @@ class NotificationServiceClient implements LoggerAwareInterface {
 	/** @var HttpRequestFactory */
 	private $httpRequestFactory;
 
+	/** @var StatusFormatter */
+	private $statusFormatter;
+
 	/** @var string */
 	private $endpointBase;
 
 	/**
 	 * @param HttpRequestFactory $httpRequestFactory
+	 * @param StatusFormatter $statusFormatter
 	 * @param string $endpointBase push service notification request endpoint base URL
 	 */
-	public function __construct( HttpRequestFactory $httpRequestFactory, string $endpointBase ) {
+	public function __construct(
+		HttpRequestFactory $httpRequestFactory,
+		StatusFormatter $statusFormatter,
+		string $endpointBase
+	) {
 		$this->httpRequestFactory = $httpRequestFactory;
+		$this->statusFormatter = $statusFormatter;
 		$this->endpointBase = $endpointBase;
 	}
 
@@ -66,15 +75,10 @@ protected function sendRequest( string $provider, array $payload ): void {
 		$request = $this->constructRequest( $provider, $payload );
 		$status = $request->execute();
 		if ( !$status->isOK() ) {
-			$errors = $status->getErrorsByType( 'error' );
-			$this->logger->warning(
-				serialize( Status::wrap( $status )->getMessage( false, false, 'en' ) ),
-				[
-					'error' => $errors,
-					'caller' => __METHOD__,
-					'content' => $request->getContent()
-				]
-			);
+			$this->logger->warning( ...$this->statusFormatter->getPsr3MessageAndContext( $status, [
+				'caller' => __METHOD__,
+				'content' => $request->getContent(),
+			] ) );
 		}
 	}