X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiTokens.php;h=4940394fe824368f71e3d8390d969af880354c8f;hb=953932c621f24efc06760c430fdbadce21e8767b;hp=f92526da765fb822c816e9131906bd3d47ca8d93;hpb=f8e44b8b113f9f9d1d09412f082f36000cfde379;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiTokens.php b/includes/api/ApiTokens.php
index f92526da76..4940394fe8 100644
--- a/includes/api/ApiTokens.php
+++ b/includes/api/ApiTokens.php
@@ -32,14 +32,14 @@ class ApiTokens extends ApiBase {
 
 	public function execute() {
 		$this->setWarning(
-			"action=tokens has been deprecated. Please use action=query&meta=tokens instead."
+			'action=tokens has been deprecated. Please use action=query&meta=tokens instead.'
 		);
-		$this->logFeatureUsage( "action=tokens" );
+		$this->logFeatureUsage( 'action=tokens' );
 
 		$params = $this->extractRequestParams();
-		$res = array(
+		$res = [
 			ApiResult::META_TYPE => 'assoc',
-		);
+		];
 
 		$types = $this->getTokenTypes();
 		foreach ( $params['type'] as $type ) {
@@ -59,20 +59,20 @@ class ApiTokens extends ApiBase {
 		// If we're in a mode that breaks the same-origin policy, no tokens can
 		// be obtained
 		if ( $this->lacksSameOriginSecurity() ) {
-			return array();
+			return [];
 		}
 
 		static $types = null;
 		if ( $types ) {
 			return $types;
 		}
-		$types = array( 'patrol' => array( 'ApiQueryRecentChanges', 'getPatrolToken' ) );
-		$names = array( 'edit', 'delete', 'protect', 'move', 'block', 'unblock',
-			'email', 'import', 'watch', 'options' );
+		$types = [ 'patrol' => [ 'ApiQueryRecentChanges', 'getPatrolToken' ] ];
+		$names = [ 'edit', 'delete', 'protect', 'move', 'block', 'unblock',
+			'email', 'import', 'watch', 'options' ];
 		foreach ( $names as $name ) {
-			$types[$name] = array( 'ApiQueryInfo', 'get' . ucfirst( $name ) . 'Token' );
+			$types[$name] = [ 'ApiQueryInfo', 'get' . ucfirst( $name ) . 'Token' ];
 		}
-		Hooks::run( 'ApiTokensGetTokenTypes', array( &$types ) );
+		Hooks::run( 'ApiTokensGetTokenTypes', [ &$types ] );
 
 		// For forwards-compat, copy any token types from ApiQueryTokens that
 		// we don't already have something for.
@@ -81,7 +81,7 @@ class ApiTokens extends ApiBase {
 		foreach ( ApiQueryTokens::getTokenTypeSalts() as $name => $salt ) {
 			if ( !isset( $types[$name] ) ) {
 				$types[$name] = function () use ( $salt, $user, $request ) {
-					return $user->getEditToken( $salt, $request );
+					return ApiQueryTokens::getToken( $user, $request->getSession(), $salt )->toString();
 				};
 			}
 		}
@@ -96,21 +96,21 @@ class ApiTokens extends ApiBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'type' => array(
+		return [
+			'type' => [
 				ApiBase::PARAM_DFLT => 'edit',
 				ApiBase::PARAM_ISMULTI => true,
 				ApiBase::PARAM_TYPE => array_keys( $this->getTokenTypes() ),
-			),
-		);
+			],
+		];
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=tokens'
 				=> 'apihelp-tokens-example-edit',
 			'action=tokens&type=email|move'
 				=> 'apihelp-tokens-example-emailmove',
-		);
+		];
 	}
 }