From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 1 Aug 2014 19:08:16 +0000 (+0000)
Subject: Merge "Enforce array type hinting in OutputPage.php"
X-Git-Tag: 1.31.0-rc.0~14630
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=8c6e9e5f2f50352b11671ac665b0889b5eb9799b;p=lhc%2Fweb%2Fwiklou.git

Merge "Enforce array type hinting in OutputPage.php"
---

8c6e9e5f2f50352b11671ac665b0889b5eb9799b
diff --cc includes/OutputPage.php
index 039342535f,0c49b7202e..85d101f7ed
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -367,9 -367,9 +367,9 @@@ class OutputPage extends ContextSource 
  	 *
  	 * Note: use setCanonicalUrl() for rel=canonical.
  	 *
 -	 * @param array $linkarr associative array of attributes.
 +	 * @param array $linkarr Associative array of attributes.
  	 */
- 	function addLink( $linkarr ) {
+ 	function addLink( array $linkarr ) {
  		array_push( $this->mLinktags, $linkarr );
  	}
  
@@@ -1235,9 -1235,9 +1235,9 @@@
  	/**
  	 * Add an array of categories, with names in the keys
  	 *
 -	 * @param array $categories mapping category name => sort key
 +	 * @param array $categories Mapping category name => sort key
  	 */
- 	public function addCategoryLinks( $categories ) {
+ 	public function addCategoryLinks( array $categories ) {
  		global $wgContLang;
  
  		if ( !is_array( $categories ) || count( $categories ) == 0 ) {
@@@ -1301,9 -1303,9 +1301,9 @@@
  	/**
  	 * Reset the category links (but not the category list) and add $categories
  	 *
 -	 * @param array $categories mapping category name => sort key
 +	 * @param array $categories Mapping category name => sort key
  	 */
- 	public function setCategoryLinks( $categories ) {
+ 	public function setCategoryLinks( array $categories ) {
  		$this->mCategoryLinks = array();
  		$this->addCategoryLinks( $categories );
  	}
@@@ -2259,10 -2249,10 +2259,10 @@@
  	/**
  	 * Output a standard permission error page
  	 *
 -	 * @param array $errors error message keys
 -	 * @param string $action action that was denied or null if unknown
 +	 * @param array $errors Error message keys
 +	 * @param string $action Action that was denied or null if unknown
  	 */
- 	public function showPermissionsErrorPage( $errors, $action = null ) {
+ 	public function showPermissionsErrorPage( array $errors, $action = null ) {
  		// For some action (read, edit, create and upload), display a "login to do this action"
  		// error if all of the following conditions are met:
  		// 1. the user is not logged in