From e02c724249cd9ea3790e1c8e9138f037b4490e29 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Mon, 3 Nov 2014 02:38:23 +0000
Subject: [PATCH] `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
---
 wp-includes/class-wp-image-editor-gd.php      | 6 ++++--
 wp-includes/class-wp-image-editor-imagick.php | 6 ++++--
 wp-includes/version.php                       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index ae65813eff..9ba6ed85b8 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -15,8 +15,10 @@
  * @uses WP_Image_Editor Extends class
  */
 class WP_Image_Editor_GD extends WP_Image_Editor {
-
-	protected $image = false; // GD Resource
+	/**
+	 * @var resource
+	 */
+	protected $image; // GD Resource
 
 	public function __destruct() {
 		if ( $this->image ) {
diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index fd9d6541f1..843b85c541 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -15,8 +15,10 @@
  * @uses WP_Image_Editor Extends class
  */
 class WP_Image_Editor_Imagick extends WP_Image_Editor {
-
-	protected $image = null; // Imagick Object
+	/**
+	 * @var Imagick
+	 */
+	protected $image; // Imagick Object
 
 	public function __destruct() {
 		if ( $this->image instanceof Imagick ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5f297cfb53..58360f59ae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.