Skip to content

Commit 93013a1

Browse files
Merge branch '2.8' into 3.1
* 2.8: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [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 a35edc2 + bf0ff95 commit 93013a1

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
@@ -26,7 +26,7 @@ class MoFileDumper extends FileDumper
2626
*/
2727
public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
2828
{
29-
$output = $sources = $targets = $sourceOffsets = $targetOffsets = '';
29+
$sources = $targets = $sourceOffsets = $targetOffsets = '';
3030
$offsets = array();
3131
$size = 0;
3232

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)