Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 3458ed7

Browse files
committed
Merge branch 'hotfix/158' into develop
Forward port #158
2 parents dbe1d7c + c8cb5c3 commit 3458ed7

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ All notable changes to this project will be documented in this file, in reverse
4545

4646
### Fixed
4747

48+
- [#158](https://github.com/zendframework/zend-code/pull/158) updates several `switch` cases to use `break` instead of `continue`
49+
in order to prevent issues under the upcoming PHP 7.3 release.
50+
4851
- [#147](https://github.com/zendframework/zend-code/pull/147) fixes the regular expression used for `@var` annotations to
4952
allow omission of the variable name.
5053

src/Generator/FileGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,17 @@ public static function fromArray(array $values)
155155
switch (strtolower(str_replace(['.', '-', '_'], '', $name))) {
156156
case 'filename':
157157
$fileGenerator->setFilename($value);
158-
continue;
158+
break;
159159
case 'class':
160160
$fileGenerator->setClass(
161161
$value instanceof ClassGenerator
162162
? $value
163163
: ClassGenerator::fromArray($value)
164164
);
165-
continue;
165+
break;
166166
case 'requiredfiles':
167167
$fileGenerator->setRequiredFiles($value);
168-
continue;
168+
break;
169169
default:
170170
if (property_exists($fileGenerator, $name)) {
171171
$fileGenerator->{$name} = $value;

src/Reflection/MethodReflection.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,22 +254,22 @@ protected function extractMethodContents($bodyOnly = false)
254254
//closure test
255255
if ($firstBrace && $tokenType == 'T_FUNCTION') {
256256
$body .= $tokenValue;
257-
continue;
257+
break;
258258
}
259259
$capture = false;
260-
continue;
260+
break;
261261
}
262262
break;
263263

264264
case '{':
265265
if ($capture === false) {
266-
continue;
266+
break;
267267
}
268268

269269
if ($firstBrace === false) {
270270
$firstBrace = true;
271271
if ($bodyOnly === true) {
272-
continue;
272+
break;
273273
}
274274
}
275275

@@ -278,7 +278,7 @@ protected function extractMethodContents($bodyOnly = false)
278278

279279
case '}':
280280
if ($capture === false) {
281-
continue;
281+
break;
282282
}
283283

284284
//check to see if this is the last brace
@@ -296,12 +296,12 @@ protected function extractMethodContents($bodyOnly = false)
296296

297297
default:
298298
if ($capture === false) {
299-
continue;
299+
break;
300300
}
301301

302302
// if returning body only wait for first brace before capturing
303303
if ($bodyOnly === true && $firstBrace !== true) {
304-
continue;
304+
break;
305305
}
306306

307307
$body .= $tokenValue;

0 commit comments

Comments
 (0)