X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2Fquery%2FApiQueryContinueTest.php;h=b31627b4d4fdac5ac91e12a6d8b247d2194fb47d;hb=d8d2b2873f7cc7a81290f462e6584ae68c937c7a;hp=d441f4c40632b871a9cffb266f6acc270f5e6c38;hpb=f873b499650ef5d27570f9cb96d01d1477f9e089;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
index d441f4c406..b31627b4d4 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
@@ -33,9 +33,10 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
 	/**
 	 * Create a set of pages. These must not change, otherwise the tests might give wrong results.
-	 * @see MediaWikiTestCase::addDBData()
+	 *
+*@see MediaWikiTestCase::addDBDataOnce()
 	 */
-	function addDBData() {
+	function addDBDataOnce() {
 		try {
 			$this->editPage( 'Template:AQCT-T1', '**Template:AQCT-T1**' );
 			$this->editPage( 'Template:AQCT-T2', '**Template:AQCT-T2**' );
@@ -60,14 +61,14 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function test1List() {
 		$this->mVerbose = false;
 		$mk = function ( $l ) {
-			return array(
+			return [
 				'list' => 'allpages',
 				'apprefix' => 'AQCT-',
 				'aplimit' => "$l",
-			);
+			];
 		};
 		$data = $this->query( $mk( 99 ), 1, '1L', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 
 		// 1 list
 		$this->checkC( $data, $mk( 1 ), 5, '1L-1' );
@@ -84,18 +85,18 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function test2Lists() {
 		$this->mVerbose = false;
 		$mk = function ( $l1, $l2 ) {
-			return array(
+			return [
 				'list' => 'allpages|alltransclusions',
 				'apprefix' => 'AQCT-',
 				'atprefix' => 'AQCT-',
 				'atunique' => '',
 				'aplimit' => "$l1",
 				'atlimit' => "$l2",
-			);
+			];
 		};
 		// 2 lists
 		$data = $this->query( $mk( 99, 99 ), 1, '2L', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 		$this->checkC( $data, $mk( 1, 1 ), 5, '2L-11' );
 		$this->checkC( $data, $mk( 2, 2 ), 3, '2L-22' );
 		$this->checkC( $data, $mk( 3, 3 ), 2, '2L-33' );
@@ -110,17 +111,17 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function testGen1Prop() {
 		$this->mVerbose = false;
 		$mk = function ( $g, $p ) {
-			return array(
+			return [
 				'generator' => 'allpages',
 				'gapprefix' => 'AQCT-',
 				'gaplimit' => "$g",
 				'prop' => 'links',
 				'pllimit' => "$p",
-			);
+			];
 		};
 		// generator + 1 prop
 		$data = $this->query( $mk( 99, 99 ), 1, 'G1P', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 		$this->checkC( $data, $mk( 1, 1 ), 11, 'G1P-11' );
 		$this->checkC( $data, $mk( 2, 2 ), 6, 'G1P-22' );
 		$this->checkC( $data, $mk( 3, 3 ), 4, 'G1P-33' );
@@ -135,18 +136,18 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function testGen2Prop() {
 		$this->mVerbose = false;
 		$mk = function ( $g, $p1, $p2 ) {
-			return array(
+			return [
 				'generator' => 'allpages',
 				'gapprefix' => 'AQCT-',
 				'gaplimit' => "$g",
 				'prop' => 'links|templates',
 				'pllimit' => "$p1",
 				'tllimit' => "$p2",
-			);
+			];
 		};
 		// generator + 2 props
 		$data = $this->query( $mk( 99, 99, 99 ), 1, 'G2P', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 		$this->checkC( $data, $mk( 1, 1, 1 ), 16, 'G2P-111' );
 		$this->checkC( $data, $mk( 2, 2, 2 ), 9, 'G2P-222' );
 		$this->checkC( $data, $mk( 3, 3, 3 ), 6, 'G2P-333' );
@@ -166,7 +167,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function testGen1Prop1List() {
 		$this->mVerbose = false;
 		$mk = function ( $g, $p, $l ) {
-			return array(
+			return [
 				'generator' => 'allpages',
 				'gapprefix' => 'AQCT-',
 				'gaplimit' => "$g",
@@ -176,11 +177,11 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 				'atprefix' => 'AQCT-',
 				'atunique' => '',
 				'atlimit' => "$l",
-			);
+			];
 		};
 		// generator + 1 prop + 1 list
 		$data = $this->query( $mk( 99, 99, 99 ), 1, 'G1P1L', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 		$this->checkC( $data, $mk( 1, 1, 1 ), 11, 'G1P1L-111' );
 		$this->checkC( $data, $mk( 2, 2, 2 ), 6, 'G1P1L-222' );
 		$this->checkC( $data, $mk( 3, 3, 3 ), 4, 'G1P1L-333' );
@@ -198,7 +199,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function testGen2Prop2List1Meta() {
 		$this->mVerbose = false;
 		$mk = function ( $g, $p1, $p2, $l1, $l2 ) {
-			return array(
+			return [
 				'generator' => 'allpages',
 				'gapprefix' => 'AQCT-',
 				'gaplimit' => "$g",
@@ -214,11 +215,11 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 				'atlimit' => "$l2",
 				'meta' => 'siteinfo',
 				'siprop' => 'namespaces',
-			);
+			];
 		};
 		// generator + 1 prop + 1 list
 		$data = $this->query( $mk( 99, 99, 99, 99, 99 ), 1, 'G2P2L1M', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 		$this->checkC( $data, $mk( 1, 1, 1, 1, 1 ), 16, 'G2P2L1M-11111' );
 		$this->checkC( $data, $mk( 2, 2, 2, 2, 2 ), 9, 'G2P2L1M-22222' );
 		$this->checkC( $data, $mk( 3, 3, 3, 3, 3 ), 6, 'G2P2L1M-33333' );
@@ -237,7 +238,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function testSameGenAndProp() {
 		$this->mVerbose = false;
 		$mk = function ( $g, $gDir, $p, $pDir ) {
-			return array(
+			return [
 				'titles' => 'AQCT-1',
 				'generator' => 'templates',
 				'gtllimit' => "$g",
@@ -245,11 +246,11 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 				'prop' => 'templates',
 				'tllimit' => "$p",
 				'tldir' => $pDir ? 'ascending' : 'descending',
-			);
+			];
 		};
 		// generator + 1 prop
 		$data = $this->query( $mk( 99, true, 99, true ), 1, 'G=P', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 
 		$this->checkC( $data, $mk( 1, true, 1, true ), 4, 'G=P-1t1t' );
 		$this->checkC( $data, $mk( 2, true, 2, true ), 2, 'G=P-2t2t' );
@@ -283,7 +284,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	public function testSameGenList() {
 		$this->mVerbose = false;
 		$mk = function ( $g, $gDir, $l, $pDir ) {
-			return array(
+			return [
 				'generator' => 'allpages',
 				'gapprefix' => 'AQCT-',
 				'gaplimit' => "$g",
@@ -292,11 +293,11 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 				'apprefix' => 'AQCT-',
 				'aplimit' => "$l",
 				'apdir' => $pDir ? 'ascending' : 'descending',
-			);
+			];
 		};
 		// generator + 1 list
 		$data = $this->query( $mk( 99, true, 99, true ), 1, 'G=L', false ) +
-			array( 'batchcomplete' => true );
+			[ 'batchcomplete' => true ];
 
 		$this->checkC( $data, $mk( 1, true, 1, true ), 5, 'G=L-1t1t' );
 		$this->checkC( $data, $mk( 2, true, 2, true ), 3, 'G=L-2t2t' );