Skip to content

Commit 637304a

Browse files
committed
AC-14557:: False positives in the backward-incompatible changes report (SVC)
1 parent 5db4912 commit 637304a

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

src/Analyzer/ClassMethodAnalyzer.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,10 @@ protected function reportChanged($report, $contextBefore, $contextAfter, $method
259259
$report->add($this->context, $data);
260260
$signatureChanged = true;
261261
} elseif ($signatureChanges['parameter_typing_changed']) {
262-
if ($signatureChanges['parameter_nullable_type_added']
263-
|| $signatureChanges['parameter_nullable_type_removed']) {
262+
if (
263+
$signatureChanges['parameter_nullable_type_added']
264+
|| $signatureChanges['parameter_nullable_type_removed']
265+
) {
264266
$data = new ClassMethodParameterTypingChangedNullable(
265267
$this->context,
266268
$this->fileAfter,
@@ -466,8 +468,10 @@ private function isReturnsEqualByNullability(ClassMethod $before, ClassMethod $a
466468
*/
467469
private function getDocReturnDeclaration(ClassMethod $method)
468470
{
469-
if (($parsedComment = $method->getAttribute('docCommentParsed'))
470-
&& isset($parsedComment['return'])) {
471+
if (
472+
($parsedComment = $method->getAttribute('docCommentParsed'))
473+
&& isset($parsedComment['return'])
474+
) {
471475
if ($parsedComment['return'][0] instanceof NullableType) {
472476
$result = '?' . $parsedComment['return'][0]->type;
473477
} else {

src/Comparator/Signature.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,15 @@ public static function analyze(array $parametersA, array $parametersB): array
147147
if ($parametersA[$i]->type !== null && $parametersB[$i]->type !== null) {
148148
$changes['parameter_typing_changed'] = true;
149149
// Custom: detect nullable added
150-
if ($typeBefore instanceof \PhpParser\Node\NullableType
151-
&& !$typeAfter instanceof \PhpParser\Node\NullableType) {
150+
if (
151+
$typeBefore instanceof \PhpParser\Node\NullableType
152+
&& !$typeAfter instanceof \PhpParser\Node\NullableType
153+
) {
152154
$changes['parameter_nullable_type_removed'] = true;
153-
} elseif (!$typeBefore instanceof \PhpParser\Node\NullableType
154-
&& $typeAfter instanceof \PhpParser\Node\NullableType) {
155+
} elseif (
156+
!$typeBefore instanceof \PhpParser\Node\NullableType
157+
&& $typeAfter instanceof \PhpParser\Node\NullableType
158+
) {
155159
$changes['parameter_nullable_type_added'] = true;
156160
}
157161
} elseif ($parametersA[$i]->type !== null) {

0 commit comments

Comments
 (0)