Skip to content

Commit bf0ff95

Browse files
Merge branch '2.7' into 2.8
* 2.7: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
2 parents 32b0c82 + 5b78058 commit bf0ff95

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dumper/MoFileDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages')
3636
*/
3737
public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
3838
{
39-
$output = $sources = $targets = $sourceOffsets = $targetOffsets = '';
39+
$sources = $targets = $sourceOffsets = $targetOffsets = '';
4040
$offsets = array();
4141
$size = 0;
4242

Loader/MoFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected function loadResource($resource)
8080
$messages = array();
8181

8282
for ($i = 0; $i < $count; ++$i) {
83-
$singularId = $pluralId = null;
83+
$pluralId = null;
8484
$translated = null;
8585

8686
fseek($stream, $offsetId + $i * 8);

0 commit comments

Comments
 (0)