Skip to content

Commit 12ee083

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: remove an invalid test [Translation] fix support of `TranslatableInterface` in `IdentityTranslator` Fix various bool-type coercions
2 parents 96c5789 + 2a32d77 commit 12ee083

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Resource/ReflectionClassResource.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private function generateSignature(\ReflectionClass $class): iterable
122122
yield print_r($attributes, true);
123123
$attributes = [];
124124

125-
yield $class->getDocComment();
125+
yield $class->getDocComment() ?: '';
126126
yield (int) $class->isFinal();
127127
yield (int) $class->isAbstract();
128128

@@ -144,7 +144,7 @@ private function generateSignature(\ReflectionClass $class): iterable
144144
yield print_r($attributes, true);
145145
$attributes = [];
146146

147-
yield $p->getDocComment();
147+
yield $p->getDocComment() ?: '';
148148
yield $p->isDefault() ? '<default>' : '';
149149
yield $p->isPublic() ? 'public' : 'protected';
150150
yield $p->isStatic() ? 'static' : '';

Tests/Builder/GeneratedConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ private function assertDirectorySame($expected, $current)
193193
}
194194
$currentFiles[substr($file->getPathname(), \strlen($current))] = $file->getPathname();
195195
}
196+
ksort($expectedFiles);
197+
ksort($currentFiles);
196198

197199
$this->assertSame(array_keys($expectedFiles), array_keys($currentFiles));
198200
foreach ($expectedFiles as $fileName => $filePath) {

0 commit comments

Comments
 (0)