From da99d29a5932feb98cef5637be6a5da36c4f911a Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 10 Jan 2015 06:13:22 +0000
Subject: [PATCH] Adding a `@return` annotation to constructors is generally
 not recommended as a constructor does not have a meaningful return value -
 anything that is returned is discarded.

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31125


git-svn-id: http://core.svn.wordpress.org/trunk@31106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/custom-background.php                   | 1 -
 wp-admin/custom-header.php                       | 1 -
 wp-admin/includes/class-wp-filesystem-ftpext.php | 2 +-
 wp-admin/includes/class-wp-filesystem-ssh2.php   | 4 ++--
 wp-admin/includes/class-wp-importer.php          | 1 -
 wp-includes/version.php                          | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index f2eca8507d..0c515c22f9 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -53,7 +53,6 @@ class Custom_Background {
 	 * @since 3.0.0
 	 * @param callback $admin_header_callback
 	 * @param callback $admin_image_div_callback Optional custom image div output callback.
-	 * @return Custom_Background
 	 */
 	public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
 		$this->admin_header_callback = $admin_header_callback;
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 7ca5dc21c2..623a1fad29 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -71,7 +71,6 @@ class Custom_Image_Header {
 	 * @since 2.1.0
 	 * @param callback $admin_header_callback
 	 * @param callback $admin_image_div_callback Optional custom image div output callback.
-	 * @return Custom_Image_Header
 	 */
 	public function __construct($admin_header_callback, $admin_image_div_callback = '') {
 		$this->admin_header_callback = $admin_header_callback;
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 79bf0bff71..7a46eeab48 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -26,7 +26,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		// Check if possible to use ftp functions.
 		if ( ! extension_loaded('ftp') ) {
 			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
-			return false;
+			return;
 		}
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 10872a5830..54ed2b9e4a 100644
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -48,11 +48,11 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		//Check if possible to use ssh2 functions.
 		if ( ! extension_loaded('ssh2') ) {
 			$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
-			return false;
+			return;
 		}
 		if ( !function_exists('stream_get_contents') ) {
 			$this->errors->add('ssh2_php_requirement', __('The ssh2 PHP extension is available, however, we require the PHP5 function <code>stream_get_contents()</code>'));
-			return false;
+			return;
 		}
 
 		// Set defaults:
diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php
index 0831993da3..17ffaa3a59 100644
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -6,7 +6,6 @@ class WP_Importer {
 	/**
 	 * Class Constructor
 	 *
-	 * @return void
 	 */
 	public function __construct() {}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bbf65fb84d..cb0d18c6d3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31124';
+$wp_version = '4.2-alpha-31125';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.