WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`WP_Image_Editor_GD` and `WP_Image_Editor_Imagick` should specify type in a doc block for the `$image` property, instead of inferring `bool` and `null`. 

See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-11-03 02:38:23 +00:00
parent a887301869
commit e02c724249
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-image-editor-gd.php
View File

@ -15,8 +15,10 @@
* @uses WP_Image_Editor Extends class * @uses WP_Image_Editor Extends class
*/ */
class WP_Image_Editor_GD extends WP_Image_Editor { class WP_Image_Editor_GD extends WP_Image_Editor {
/**
protected $image = false; // GD Resource * @var resource
*/
protected $image; // GD Resource
public function __destruct() { public function __destruct() {
if ( $this->image ) { if ( $this->image ) {

6
wp-includes/class-wp-image-editor-imagick.php
View File

@ -15,8 +15,10 @@
* @uses WP_Image_Editor Extends class * @uses WP_Image_Editor Extends class
*/ */
class WP_Image_Editor_Imagick extends WP_Image_Editor { class WP_Image_Editor_Imagick extends WP_Image_Editor {
/**
protected $image = null; // Imagick Object * @var Imagick
*/
protected $image; // Imagick Object
public function __destruct() { public function __destruct() {
if ( $this->image instanceof Imagick ) { if ( $this->image instanceof Imagick ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30179'; $wp_version = '4.1-alpha-30180';
/** /**
* 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.