Merge "Revert "selenium: add new message banner test to user spec""

[lhc/web/wiklou.git] / includes / api / ApiTokens.php

diff --git a/includes/api/ApiTokens.php b/includes/api/ApiTokens.php
index c10c938..606967d 100644 (file)
--- a/includes/api/ApiTokens.php
+++ b/includes/api/ApiTokens.php
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- *
- * Created on Jul 29, 2011
- *
  * Copyright © 2011 John Du Hart john@johnduhart.me
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,22 +27,22 @@
 class ApiTokens extends ApiBase {
 
        public function execute() {
-               $this->setWarning(
-                       "action=tokens has been deprecated. Please use action=query&meta=tokens instead."
+               $this->addDeprecation(
+                       [ 'apiwarn-deprecation-withreplacement', 'action=tokens', 'action=query&meta=tokens' ],
+                       'action=tokens'
                );
-               $this->logFeatureUsage( "action=tokens" );
 
                $params = $this->extractRequestParams();
-               $res = array(
+               $res = [
                        ApiResult::META_TYPE => 'assoc',
-               );
+               ];
 
                $types = $this->getTokenTypes();
                foreach ( $params['type'] as $type ) {
                        $val = call_user_func( $types[$type], null, null );
 
                        if ( $val === false ) {
-                               $this->setWarning( "Action '$type' is not allowed for the current user" );
+                               $this->addWarning( [ 'apiwarn-tokennotallowed', $type ] );
                        } else {
                                $res[$type . 'token'] = $val;
                        }
@@ -59,20 +55,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.
@@ -96,21 +92,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',
-               );
+               ];
        }
 }