From f8d2958da9b9eeaed6d5fc84cb5fb0420abe5ebb Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Thu, 19 Apr 2012 14:07:40 +0100
Subject: [PATCH] Can't return values from functions that don't return anything

Change-Id: If964ce2f39904f1e9e3101e7cafaa6a96d58adfc
---
 includes/api/ApiQueryBase.php       | 2 +-
 includes/db/ORMRow.php              | 2 +-
 includes/upload/UploadFromStash.php | 2 +-
 includes/upload/UploadFromUrl.php   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 2666045b23..a63374847f 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -233,7 +233,7 @@ abstract class ApiQueryBase extends ApiBase {
 	 */
 	protected function addTimestampWhereRange( $field, $dir, $start, $end, $sort = true ) {
 		$db = $this->getDb();
-		return $this->addWhereRange( $field, $dir,
+		$this->addWhereRange( $field, $dir,
 			$db->timestampOrNull( $start ), $db->timestampOrNull( $end ), $sort );
 	}
 
diff --git a/includes/db/ORMRow.php b/includes/db/ORMRow.php
index a063f7235c..4ac41cceb7 100644
--- a/includes/db/ORMRow.php
+++ b/includes/db/ORMRow.php
@@ -207,7 +207,7 @@ abstract class ORMRow {
 	 * @param integer|null $id
 	 */
 	public function setId( $id ) {
-		return $this->setField( 'id', $id );
+		$this->setField( 'id', $id );
 	}
 
 	/**
diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 8805c50b50..317dd55b95 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -99,7 +99,7 @@ class UploadFromStash extends UploadBase {
 		// chooses one of wpDestFile, wpUploadFile, filename in that order.
 		$desiredDestName = $request->getText( 'wpDestFile', $request->getText( 'wpUploadFile', $request->getText( 'filename' ) ) );
 
-		return $this->initialize( $fileKey, $desiredDestName );
+		$this->initialize( $fileKey, $desiredDestName );
 	}
 
 	/**
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 0ae8a22c22..49bfb910e4 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -93,7 +93,7 @@ class UploadFromUrl extends UploadBase {
 		if ( !$desiredDestName ) {
 			$desiredDestName = $request->getText( 'wpUploadFileURL' );
 		}
-		return $this->initialize(
+		$this->initialize(
 			$desiredDestName,
 			trim( $request->getVal( 'wpUploadFileURL' ) ),
 			false
-- 
2.20.1