Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-07 08:01:54 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
Scott Taylor 2015-01-10 06:13:22 +00:00
parent 1b3f91f500
commit da99d29a59
6 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/custom-background.php
View File

@ -53,7 +53,6 @@ class Custom_Background {
* @since 3.0.0 * @since 3.0.0
* @param callback $admin_header_callback * @param callback $admin_header_callback
* @param callback $admin_image_div_callback Optional custom image div output 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 = '') { public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
$this->admin_header_callback = $admin_header_callback; $this->admin_header_callback = $admin_header_callback;

1
wp-admin/custom-header.php
View File

@ -71,7 +71,6 @@ class Custom_Image_Header {
* @since 2.1.0 * @since 2.1.0
* @param callback $admin_header_callback * @param callback $admin_header_callback
* @param callback $admin_image_div_callback Optional custom image div output 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 = '') { public function __construct($admin_header_callback, $admin_image_div_callback = '') {
$this->admin_header_callback = $admin_header_callback; $this->admin_header_callback = $admin_header_callback;

2
wp-admin/includes/class-wp-filesystem-ftpext.php
View File

@ -26,7 +26,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
// Check if possible to use ftp functions. // Check if possible to use ftp functions.
if ( ! extension_loaded('ftp') ) { if ( ! extension_loaded('ftp') ) {
$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available')); $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. // This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.

4
wp-admin/includes/class-wp-filesystem-ssh2.php
View File

@ -48,11 +48,11 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
//Check if possible to use ssh2 functions. //Check if possible to use ssh2 functions.
if ( ! extension_loaded('ssh2') ) { if ( ! extension_loaded('ssh2') ) {
$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available')); $this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
return false; return;
} }
if ( !function_exists('stream_get_contents') ) { 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>')); $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: // Set defaults:

1
wp-admin/includes/class-wp-importer.php
View File

@ -6,7 +6,6 @@ class WP_Importer {
/** /**
* Class Constructor * Class Constructor
* *
* @return void
*/ */
public function __construct() {} public function __construct() {}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.