Changeset 43653 for trunk

Timestamp:

09/23/2018 10:49:02 PM (6 years ago)

Author:

jorbin

Message:

General: PHP7.3 throws an E_WARNING when using continue to target a switch

Applying continue to a switch is equivalent to using break and quite possibly, a continue targeting a higher level control structure is actually intended.

To target the higher level control structure, a numeric argument has to be passed to continue. This fixes two cases in WordPress Core where this is currently happening.

See: ​https://github.com/php/php-src/pull/3364
See: ​https://wiki.php.net/rfc/continue_on_switch_deprecation

Props jrf.
Fixes #44543.

Location:

trunk

Files:

• src/wp-includes/pomo/plural-forms.php (modified) (1 diff)
• tests/phpunit/includes/utils.php (modified) (1 diff)

trunk/src/wp-includes/pomo/plural-forms.php

@@ -208 +208 @@
                         $output[] = array( 'value', intval( substr( $str, $pos, $span ) ) );
                         $pos     += $span;
-                        continue;
+                        break;
                     }
 

trunk/tests/phpunit/includes/utils.php

@@ -499 +499 @@
                 return $i;
             case PREG_BACKTRACK_LIMIT_ERROR:
-                continue;
+                break;
             case PREG_RECURSION_LIMIT_ERROR:
                 trigger_error( 'PCRE recursion limit encountered before backtrack limit.' );