Fix warnings about continue inside switch on PHP 7.3 (ezsystems#1387)

ezpublishlegacy · Oct 10, 2018 · 929df6b · 929df6b
1 parent b494b89
commit 929df6b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/kernel/classes/ezcollaborationgroup.php b/kernel/classes/ezcollaborationgroup.php
@@ -226,7 +226,7 @@ static function subTree( $parameters = array() )
                         default:
                         {
                             eZDebug::writeWarning( 'Unknown sort field: ' . $sortField, __METHOD__ );
-                            continue;
+                            continue 2;
                         }
                     }
                     $sortOrder = true; // true is ascending

diff --git a/kernel/classes/ezcollaborationitem.php b/kernel/classes/ezcollaborationitem.php
@@ -389,7 +389,7 @@ static function fetchListTool( $parameters = array(), $asCount )
                             default:
                             {
                                 eZDebug::writeWarning( 'Unknown sort field: ' . $sortField, __METHOD__ );
-                                continue;
+                                continue 2;
                             }
                         }
                         $sortOrder = true; // true is ascending

diff --git a/kernel/classes/ezcontentobjecttreenode.php b/kernel/classes/ezcontentobjecttreenode.php
@@ -731,7 +731,7 @@ static function createSortingSQLStrings( $sortList, $treeTableName = 'ezcontento
                             else
                             {
                                 eZDebug::writeWarning( 'Unknown sort field: ' . $sortField, __METHOD__ );
-                                continue;
+                                continue 2;
                             }
                         }
                     }

diff --git a/kernel/classes/ezsiteaccess.php b/kernel/classes/ezsiteaccess.php
@@ -157,7 +157,7 @@ public static function match( eZURI $uri, $host, $port = 80, $file = '/index.php
                         return $access;
                     }
                     else
-                        continue;
+                        continue 2;
                 } break;
                 case 'port':
                 {
@@ -168,7 +168,7 @@ public static function match( eZURI $uri, $host, $port = 80, $file = '/index.php
                         return $access;
                     }
                     else
-                        continue;
+                        continue 2;
                 } break;
                 case 'uri':
                 {
@@ -222,7 +222,7 @@ public static function match( eZURI $uri, $host, $port = 80, $file = '/index.php
                         $match_num = $ini->variable( 'SiteAccessSettings', 'URIMatchRegexpItem' );
                     }
                     else
-                        continue;
+                        continue 2;
                 } break;
                 case 'host':
                 {
@@ -264,7 +264,7 @@ public static function match( eZURI $uri, $host, $port = 80, $file = '/index.php
                         $match_num = $ini->variable( 'SiteAccessSettings', 'HostMatchRegexpItem' );
                     }
                     else
-                        continue;
+                        continue 2;
                 } break;
                 case 'host_uri':
                 {
@@ -353,7 +353,7 @@ public static function match( eZURI $uri, $host, $port = 80, $file = '/index.php
                         $match_num = $ini->variable( 'SiteAccessSettings', 'IndexMatchRegexpItem' );
                     }
                     else
-                        continue;
+                        continue 2;
                 } break;
                 default:
                 {

diff --git a/kernel/package/ezpackagefunctioncollection.php b/kernel/package/ezpackagefunctioncollection.php
@@ -67,7 +67,6 @@ function fetchList( $filterArray = false, $offset, $limit, $repositoryID )
                         default:
                         {
                             eZDebug::writeWarning( 'Unknown package filter name: ' . $filterName );
-                            continue;
                         }
                     }
                 }
@@ -158,7 +157,6 @@ function fetchDependentPackageList( $packageName, $filterArray = false, $reposit
                         default:
                         {
                             eZDebug::writeWarning( 'Unknown package filter name: ' . $filterName );
-                            continue;
                         }
                     }
                 }

diff --git a/kernel/search/plugins/ezsearchengine/ezsearchengine.php b/kernel/search/plugins/ezsearchengine/ezsearchengine.php
@@ -1206,7 +1206,7 @@ function buildSortSQL( $sortArray )
                         default:
                         {
                             eZDebug::writeWarning( 'Unknown sort field: ' . $sortField, __METHOD__ );
-                            continue;
+                            continue 2;
                         }
                     }
                     $sortOrder = true; // true is ascending

diff --git a/lib/ezutils/classes/ezmoduleoperationinfo.php b/lib/ezutils/classes/ezmoduleoperationinfo.php
@@ -455,8 +455,7 @@ function executeBody( $includeFile, $className, $bodyStructure,
                     if ( !$this->UseTriggers )
                     {
                         $bodyReturnValue['status'] = eZModuleOperationInfo::STATUS_CONTINUE;
-                        continue;
-
+                        continue 2;
                     }
 
                     $triggerName = $body['name'];