From 847f92ca233c800a88b4ac6a7a14cc72577f87d8 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Wed, 22 Apr 2015 11:56:55 -0400 Subject: [PATCH] API: Remove warning about continuation change Change-Id: I2a69e8ae7dc7df915ceaaeed740b74d55f9207ce --- includes/api/ApiQuery.php | 11 ----------- .../includes/api/query/ApiQueryContinueTestBase.php | 4 ---- tests/phpunit/includes/api/query/ApiQueryTestBase.php | 4 ---- 3 files changed, 19 deletions(-) diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index 5378e9259f..69ddd9dca0 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -301,17 +301,6 @@ class ApiQuery extends ApiBase { } else { $continuationManager->setContinuationIntoResult( $this->getResult() ); } - - /// @todo: Remove this after a suitable period of time. When REL1_26 is cut, if not before. - if ( $this->mParams['continue'] === null && !$this->mParams['rawcontinue'] && - $this->getResult()->getResultData( 'continue' ) !== null - ) { - $this->setWarning( - 'Formatting of continuation data has changed. ' . - 'To receive raw query-continue data, use the \'rawcontinue\' parameter. ' . - 'To silence this warning, pass an empty string for \'continue\' in the initial query.' - ); - } } /** diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php index 3960e8802c..9e8f9ab109 100644 --- a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php +++ b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php @@ -57,10 +57,6 @@ abstract class ApiQueryContinueTestBase extends ApiQueryTestBase { } else { $params['action'] = 'query'; } - // Silence warning - if ( !isset( $params['continue'] ) ) { - $params['continue'] = ''; - } $count = 0; $result = array(); $continue = array(); diff --git a/tests/phpunit/includes/api/query/ApiQueryTestBase.php b/tests/phpunit/includes/api/query/ApiQueryTestBase.php index d5fa454208..25d1efc99e 100644 --- a/tests/phpunit/includes/api/query/ApiQueryTestBase.php +++ b/tests/phpunit/includes/api/query/ApiQueryTestBase.php @@ -100,10 +100,6 @@ STR; if ( !array_key_exists( 'action', $req ) ) { $req['action'] = 'query'; } - // Silence warning - if ( !isset( $params['continue'] ) ) { - $params['continue'] = ''; - } foreach ( $req as &$val ) { if ( is_array( $val ) ) { $val = implode( '|', array_unique( $val ) ); -- 2.20.1