From ee6b559630ca96fccf7cf51ae0fd783d0d55c3de Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 13 May 2011 16:16:44 +0000
Subject: [PATCH] Fix unused variables

Decapitalise False
---
 includes/Article.php                                  |  2 +-
 includes/ZipDirectoryReader.php                       | 10 ++++++----
 skins/Standard.php                                    |  2 +-
 tests/selenium/suites/AddContentToNewPageTestCase.php |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index b3cd3b42d0..4f1d5466fa 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1733,7 +1733,7 @@ class Article {
 	 * or else the record will be left in a funky state.
 	 * Best if all done inside a transaction.
 	 *
-	 * @param $dbw Database
+	 * @param $dbw DatabaseBase
 	 * @return int The newly created page_id key, or false if the title already existed
 	 * @private
 	 */
diff --git a/includes/ZipDirectoryReader.php b/includes/ZipDirectoryReader.php
index eb75b68736..d21cf3b052 100644
--- a/includes/ZipDirectoryReader.php
+++ b/includes/ZipDirectoryReader.php
@@ -16,8 +16,8 @@ class ZipDirectoryReader {
 	 * suspicious or ambiguous input, instead of emulating some standard
 	 * behaviour.
 	 *
-	 * @param $fileName The archive file name
-	 * @param $callback The callback function. It will be called for each file 
+	 * @param $fileName string The archive file name
+	 * @param $callback Array The callback function. It will be called for each file
 	 *   with a single associative array each time, with members:
 	 *
 	 *      - name: The file name. Directories conventionally have a trailing 
@@ -27,7 +27,7 @@ class ZipDirectoryReader {
 	 *
 	 *      - size: The uncompressed file size
 	 *
-	 * @param $options An associative array of read options, with the option
+	 * @param $options Array An associative array of read options, with the option
 	 *    name in the key. This may currently contain:
 	 *
 	 *      - zip64: If this is set to true, then we will emulate a 
@@ -44,7 +44,7 @@ class ZipDirectoryReader {
 	 *        valid ZIP64 file, and working out what non-ZIP64 readers will make 
 	 *        of such a file is not trivial.
 	 *
-	 * @return A Status object. The following fatal errors are defined:
+	 * @return Status object. The following fatal errors are defined:
 	 *
 	 *      - zip-file-open-error: The file could not be opened.
 	 *
@@ -119,6 +119,8 @@ class ZipDirectoryReader {
 
 	/**
 	 * Read the directory according to settings in $this.
+	 *
+	 * @return Status
 	 */
 	function execute() {
 		$this->file = fopen( $this->fileName, 'r' );
diff --git a/skins/Standard.php b/skins/Standard.php
index bb540ae187..41a796b8e7 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -120,7 +120,7 @@ class StandardTemplate extends LegacyTemplate {
 		unset( $bar['TOOLBOX'] );
 
 		$barnumber = 1;
-		foreach ( $bar as $heading => $browseLinks ) {
+		foreach ( $bar as $browseLinks ) {
 			if ( $barnumber > 1 ) {
 				$s .= "\n<hr class='sep' />";
 			} 
diff --git a/tests/selenium/suites/AddContentToNewPageTestCase.php b/tests/selenium/suites/AddContentToNewPageTestCase.php
index 4965b52cfa..72e75e11e0 100644
--- a/tests/selenium/suites/AddContentToNewPageTestCase.php
+++ b/tests/selenium/suites/AddContentToNewPageTestCase.php
@@ -114,8 +114,8 @@ class AddContentToNewPageTestCase extends SeleniumTestCase {
 
     // Add level 2 headline and verify output in the preview
     public function testAddLevel2HeadLine() {
-        $blnElementPresent = False;
-        $blnTextPresent = False;
+        $blnElementPresent = false;
+        $blnTextPresent = false;
         $this->getExistingPage();
         $this->clickEditLink();
         $this->loadWikiEditor();
-- 
2.20.1