From: Tyler Anthony Romeo <tylerromeo@gmail.com>
Date: Fri, 24 Jan 2014 18:32:36 +0000 (-0800)
Subject: Code style fixes to ApiBase::requireAtLeastOneParameter
X-Git-Tag: 1.31.0-rc.0~17055^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=c96ddf294846066c7845b87cbd4f5420b60ab657;p=lhc%2Fweb%2Fwiklou.git

Code style fixes to ApiBase::requireAtLeastOneParameter

Fixes to patch that introduced ApiBase::requireAtLeastOneParameter.
Includes line breaks, code formatting, and documentation fixes.

Change-Id: I1a2faebf7cc9a2126def66d8a4ce64dbfa84059b
Follows-Up: Iae6649ed503fdbf14 (5e7a9c6f8e66de344e)
---

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index c1a4cd353e..e610d19519 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -803,25 +803,32 @@ abstract class ApiBase extends ContextSource {
 
 	/**
 	 * Die if none of a certain set of parameters is set and not false.
-	 * @param array $params of parameter names
+	 *
+	 * @since 1.23
+	 * @param array $params User provided set of parameters
+	 * @param string ... List of parameter names to check
 	 */
 	public function requireAtLeastOneParameter( $params ) {
 		$required = func_get_args();
 		array_shift( $required );
 		$p = $this->getModulePrefix();
 
-		$intersection = array_intersect( array_keys( array_filter( $params,
-			array( $this, "parameterNotEmpty" ) ) ), $required );
+		$intersection = array_intersect(
+			array_keys( array_filter( $params, array( $this, "parameterNotEmpty" ) ) ),
+			$required
+		);
 
 		if ( count( $intersection ) == 0 ) {
-			$this->dieUsage( "At least one of the parameters {$p}" . implode( ", {$p}", $required ) . ' is required', "{$p}missingparam" );
+			$this->dieUsage( "At least one of the parameters {$p}" .
+				implode( ", {$p}", $required ) . ' is required', "{$p}missingparam" );
 		}
 	}
 
 	/**
 	 * Generates the possible errors requireAtLeastOneParameter() can die with
 	 *
-	 * @param $params array
+	 * @since 1.23
+	 * @param $params array Array of parameter key names
 	 * @return array
 	 */
 	public function getRequireAtLeastOneParameterErrorMessages( $params ) {
@@ -829,7 +836,10 @@ abstract class ApiBase extends ContextSource {
 		$params = implode( ", {$p}", $params );
 
 		return array(
-			array( 'code' => "{$p}missingparam", 'info' => "At least one of the parameters {$p}{$params} is required" ),
+			array(
+				'code' => "{$p}missingparam",
+				'info' => "At least one of the parameters {$p}{$params} is required",
+			),
 		);
 	}