diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php
index 10af816dbe..f8aeb86f88 100644
--- a/wp-admin/includes/class-wp-filesystem-base.php
+++ b/wp-admin/includes/class-wp-filesystem-base.php
@@ -371,9 +371,11 @@ class WP_Filesystem_Base {
 		$legal =  array('', 'w', 'r', 'x', '-');
 		$attarray = preg_split('//', $mode);
 
-		for ($i=0; $i < count($attarray); $i++)
-		   if ($key = array_search($attarray[$i], $legal))
+		for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
+		   if ($key = array_search($attarray[$i], $legal)) {
 			   $realmode .= $legal[$key];
+		   }
+		}
 
 		$mode = str_pad($realmode, 10, '-', STR_PAD_LEFT);
 		$trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index 4602e7fba1..390465752f 100644
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -461,7 +461,7 @@ function image_edit_apply_changes( $image, $changes ) {
 	// Combine operations.
 	if ( count($changes) > 1 ) {
 		$filtered = array($changes[0]);
-		for ( $i = 0, $j = 1; $j < count($changes); $j++ ) {
+		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
 			$combined = false;
 			if ( $filtered[$i]->type == $changes[$j]->type ) {
 				switch ( $filtered[$i]->type ) {
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index b44f6d596f..6d71f646b2 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -1756,7 +1756,7 @@ function make_url_footnote( $content ) {
 	_deprecated_function( __FUNCTION__, '2.9', '' );
 	preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
 	$links_summary = "\n";
-	for ( $i=0; $i<count($matches[0]); $i++ ) {
+	for ( $i = 0, $c = count( $matches[0] ); $i < $c; $i++ ) {
 		$link_match = $matches[0][$i];
 		$link_number = '['.($i+1).']';
 		$link_url = $matches[2][$i];
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0e5bfe7799..a18f79614c 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -633,9 +633,9 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
 		// Now re-encode everything except &entity;
 		$string = preg_split( '/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
 
-		for ( $i = 0; $i < count( $string ); $i += 2 )
+		for ( $i = 0, $c = count( $string ); $i < $c; $i += 2 ) {
 			$string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
-
+		}
 		$string = implode( '', $string );
 	}
 
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 0050d10b7c..065bea6cce 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1516,7 +1516,7 @@ function wp_mkdir_p( $target ) {
 		 */
 		if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
 			$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
-			for ( $i = 1; $i <= count( $folder_parts ); $i++ ) {
+			for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
 				@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
 			}
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c48e865d3e..0bab0c29ae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31553';
+$wp_version = '4.2-alpha-31554';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.