Skip to content

Commit 5c3229b

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Increase the inlining YAML level for config:debug [Serializer] Minor: fix CS and PHPDoc [Form] fix tests [Serializer] Ensure that groups are strings [Debug] Tell that the extension is for PHP 5 only Static code analysis Update AnnotationDirectoryLoader.php added a test Escape the delimiter in Glob::toRegex [FrameworkBundle] Fix template location for PHP templates [FrameworkBundle] Add path verification to the template parsing test cases
2 parents 923b069 + f87f664 commit 5c3229b

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Dumper/PhpFileDumper.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ protected function format(MessageCatalogue $messages, $domain)
3535
*/
3636
public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
3737
{
38-
$output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
39-
40-
return $output;
38+
return "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
4139
}
4240

4341
/**

0 commit comments

Comments
 (0)