Merge branch 'hotfix/158'

Close #158
zendframework · Aug 13, 2018 · 661956c · 661956c
2 parents 1d2a759 + c8cb5c3
commit 661956c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#158](https://github.com/zendframework/zend-code/pull/158) updates several `switch` cases to use `break` instead of `continue`
+  in order to prevent issues under the upcoming PHP 7.3 release.
+
 - [#147](https://github.com/zendframework/zend-code/pull/147) fixes the regular expression used for `@var` annotations to
   allow omission of the variable name.
 

diff --git a/src/Generator/FileGenerator.php b/src/Generator/FileGenerator.php
@@ -155,17 +155,17 @@ public static function fromArray(array $values)
             switch (strtolower(str_replace(['.', '-', '_'], '', $name))) {
                 case 'filename':
                     $fileGenerator->setFilename($value);
-                    continue;
+                    break;
                 case 'class':
                     $fileGenerator->setClass(
                         $value instanceof ClassGenerator
                         ? $value
                         : ClassGenerator::fromArray($value)
                     );
-                    continue;
+                    break;
                 case 'requiredfiles':
                     $fileGenerator->setRequiredFiles($value);
-                    continue;
+                    break;
                 default:
                     if (property_exists($fileGenerator, $name)) {
                         $fileGenerator->{$name} = $value;

diff --git a/src/Reflection/MethodReflection.php b/src/Reflection/MethodReflection.php
@@ -287,22 +287,22 @@ protected function extractMethodContents($bodyOnly = false)
                         //closure test
                         if ($firstBrace && $tokenType == 'T_FUNCTION') {
                             $body .= $tokenValue;
-                            continue;
+                            break;
                         }
                         $capture = false;
-                        continue;
+                        break;
                     }
                     break;
 
                 case '{':
                     if ($capture === false) {
-                        continue;
+                        break;
                     }
 
                     if ($firstBrace === false) {
                         $firstBrace = true;
                         if ($bodyOnly === true) {
-                            continue;
+                            break;
                         }
                     }
 
@@ -311,7 +311,7 @@ protected function extractMethodContents($bodyOnly = false)
 
                 case '}':
                     if ($capture === false) {
-                        continue;
+                        break;
                     }
 
                     //check to see if this is the last brace
@@ -329,12 +329,12 @@ protected function extractMethodContents($bodyOnly = false)
 
                 default:
                     if ($capture === false) {
-                        continue;
+                        break;
                     }
 
                     // if returning body only wait for first brace before capturing
                     if ($bodyOnly === true && $firstBrace !== true) {
-                        continue;
+                        break;
                     }
 
                     $body .= $tokenValue;