PHP 7.3 continue / break clarification

PHP 7.3 started warning on 'continue' statements inside switches,
where they act just like 'break' statements. To actually continue
the enclosing loop, it would have to be 'continue 2'. Since that's
a weird syntax and these two cases have nothing after the switch,
I've replaced them here with break.

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index cffdac62c0f416f52e9dbb2758adc3c7f051e4e5..085194fdf5042cdd71fd391c906a57d8d8c2c6c9 100644 (file)
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -1564,7 +1564,7 @@ ORDER BY civicrm_custom_group.weight,
 
           case 'File':
             if ($skipFile) {
-              continue;
+              break;
             }
 
             //store the file in d/b

diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php
index 922653857d8f5264384f966e71c77ad992266b09..670bb0fb8c16e2fceca22eb171ee0a5f99aac381 100644 (file)
--- a/CRM/Price/BAO/PriceSet.php
+++ b/CRM/Price/BAO/PriceSet.php
@@ -737,7 +737,7 @@ WHERE  id = %1";
         case 'Radio':
           //special case if user select -none-
           if ($params["price_{$id}"] <= 0) {
-            continue;
+            break;
           }
           $params["price_{$id}"] = array($params["price_{$id}"] => 1);
           $optionValueId = CRM_Utils_Array::key(1, $params["price_{$id}"]);