Changeset 43656 for branches/4.9

Timestamp:

09/24/2018 08:04:56 PM (6 years ago)

Author:

SergeyBiryukov

Message:

General: PHP 7.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.
Merges [43653] to the 4.9 branch.
Fixes #44543.

Location:

branches/4.9

Files:

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

branches/4.9/src/wp-includes/pomo/plural-forms.php

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

branches/4.9/tests/phpunit/includes/utils.php

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