Ticket #56791: 56791-fix-spacing-for-incrementors-and-decrementors.patch

src/wp-admin/includes/template.php

@@ -626 +626 @@
         }
 
         $r = '';
-        ++ $count;
+        ++$count;
 
         if ( is_serialized( $entry['meta_value'] ) ) {
                 if ( is_serialized_string( $entry['meta_value'] ) ) {

src/wp-includes/functions.php

@@ -262 +262 @@
                 $month         = $wp_locale->get_month( $datetime->format( 'm' ) );
                 $weekday       = $wp_locale->get_weekday( $datetime->format( 'w' ) );
 
-                for ( $i = 0; $i < $format_length; $i ++ ) {
+                for ( $i = 0; $i < $format_length; $i++ ) {
                         switch ( $format[ $i ] ) {
                                 case 'D':
                                         $new_format .= addcslashes( $wp_locale->get_weekday_abbrev( $weekday ), '\\A..Za..z' );

src/wp-includes/sitemaps/class-wp-sitemaps-provider.php

@@ -107 +107 @@
                 $sitemap_types = $this->get_sitemap_type_data();
 
                 foreach ( $sitemap_types as $type ) {
-                        for ( $page = 1; $page <= $type['pages']; $page ++ ) {
+                        for ( $page = 1; $page <= $type['pages']; $page++ ) {
                                 $sitemap_entry = array(
                                         'loc' => $this->get_sitemap_url( $type['name'], $page ),
                                 );

tests/phpunit/includes/wp-profiler.php

@@ -73 +73 @@
 
                 if ( isset( $this->profile[ $name ] ) ) {
                         $this->profile[ $name ]['time'] += $time;
-                        $this->profile[ $name ]['calls'] ++;
+                        $this->profile[ $name ]['calls']++;
                         $this->profile[ $name ]['cache_cold_hits']    += ( $wp_object_cache->cold_cache_hits - $item['cache_cold_hits'] );
                         $this->profile[ $name ]['cache_warm_hits']    += ( $wp_object_cache->warm_cache_hits - $item['cache_warm_hits'] );
                         $this->profile[ $name ]['cache_misses']       += ( $wp_object_cache->cache_misses - $item['cache_misses'] );
@@ -143 +143 @@
                         $sql = preg_replace( '/(WHERE \w+ =) \d+/', '$1 x', $sql );
                         $sql = preg_replace( '/(WHERE \w+ =) \'\[-\w]+\'/', '$1 \'xxx\'', $sql );
 
-                        $out[ $sql ] ++;
+                        $out[ $sql ]++;
                 }
                 asort( $out );
                 return;

tests/phpunit/tests/date/theDate.php

@@ -80 +80 @@
         }
 
         public function count_hook( $input ) {
-                $this->hooks_called[ current_filter() ] ++;
+                $this->hooks_called[ current_filter() ]++;
 
                 return $input;
         }

tests/phpunit/tests/meta/isProtectedMeta.php

@@ -17 +17 @@
                 $protected_keys = array(
                         array( '_wp_attachment' ),
                 );
-                for ( $i = 0, $max = 31; $i < $max; $i ++ ) {
+                for ( $i = 0, $max = 31; $i < $max; $i++ ) {
                         $protected_keys[] = array( chr( $i ) . '_wp_attachment' );
                 }
-                for ( $i = 127, $max = 159; $i <= $max; $i ++ ) {
+                for ( $i = 127, $max = 159; $i <= $max; $i++ ) {
                         $protected_keys[] = array( chr( $i ) . '_wp_attachment' );
                 }
                 $protected_keys[] = array( chr( 95 ) . '_wp_attachment' );
@@ -42 +42 @@
                         array( 'ąŌ_not_so_protected_meta' ),
                 );
 
-                for ( $i = 32, $max = 94; $i <= $max; $i ++ ) {
+                for ( $i = 32, $max = 94; $i <= $max; $i++ ) {
                         $unprotected_keys[] = array( chr( $i ) . '_wp_attachment' );
                 }
-                for ( $i = 96, $max = 126; $i <= $max; $i ++ ) {
+                for ( $i = 96, $max = 126; $i <= $max; $i++ ) {
                         $unprotected_keys[] = array( chr( $i ) . '_wp_attachment' );
                 }
 

tests/phpunit/tests/rest-api/rest-sidebars-controller.php

@@ -949 +949 @@
                         if ( isset( $item['_links'] ) ) {
                                 unset( $data[ $count ]['_links'] );
                         }
-                        $count ++;
+                        $count++;
                 }
 
                 return $data;

tests/phpunit/tests/rest-api/rest-widgets-controller.php

@@ -1555 +1555 @@
                         if ( is_array( $item ) && isset( $item['_links'] ) ) {
                                 unset( $data[ $count ]['_links'] );
                         }
-                        $count ++;
+                        $count++;
                 }
 
                 return $data;

tests/phpunit/tests/rest-api/wpRestMenuItemsController.php

@@ -375 +375 @@
                 $new_menu_id = wp_create_nav_menu( rand_str() );
                 $expected    = array();
                 $actual      = array();
-                for ( $i = 1; $i < 5; $i ++ ) {
+                for ( $i = 1; $i < 5; $i++ ) {
                         $request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
                         $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                         $params = $this->set_menu_item_data(
@@ -921 +921 @@
                         foreach ( $taxonomies as $taxonomy ) {
                                 $this->assertSame( $taxonomy->name, $links['https://api.w.org/term'][ $num ]['attributes']['taxonomy'] );
                                 $this->assertSame( add_query_arg( 'post', $data['id'], rest_url( 'wp/v2/' . $taxonomy->rest_base ) ), $links['https://api.w.org/term'][ $num ]['href'] );
-                                $num ++;
+                                $num++;
                         }
 
                         if ( 'post_type' === $data['type'] ) {

tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -648 +648 @@
                 $this->assertNotEmpty( $user_cpt, 'User CPT is expected not to be empty.' );
 
                 $global_styles_query_count = 0;
-                for ( $i = 0; $i < 3; $i ++ ) {
+                for ( $i = 0; $i < 3; $i++ ) {
                         $new_user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
                         WP_Theme_JSON_Resolver::clean_cached_data();
                         $this->assertSameSets( $user_cpt, $new_user_cpt, "User CPTs do not match on run {$i}." );