Skip to content

Commit 55646aa

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash
2 parents 45e5b5e + 3ecc739 commit 55646aa

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Definition/Dumper/XmlReferenceDumper.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,5 +296,7 @@ private function writeValue($value): string
296296
if (\is_array($value)) {
297297
return implode(',', $value);
298298
}
299+
300+
return '';
299301
}
300302
}

Loader/FileLoader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,7 @@ private function doImport($resource, $type = null, bool $ignoreErrors = false, $
166166
throw new LoaderLoadException($resource, $sourceResource, null, $e, $type);
167167
}
168168
}
169+
170+
return null;
169171
}
170172
}

0 commit comments

Comments
 (0)