Skip to content

Commit 148e136

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [WebProfilerBundle] Don't inherit CSS text-transform property for the toolbar. Remove duplicate cursor property 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 8fe42e1 + 5c3229b commit 148e136

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
@@ -25,9 +25,7 @@ class PhpFileDumper extends FileDumper
2525
*/
2626
public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
2727
{
28-
$output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
29-
30-
return $output;
28+
return "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
3129
}
3230

3331
/**

0 commit comments

Comments
 (0)