Skip to content

Commit

Permalink
Merge branch '2.8' into 3.0
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabpot committed Jan 27, 2016
2 parents 8fe42e1 + 5c3229b commit 148e136
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Dumper/PhpFileDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ class PhpFileDumper extends FileDumper
*/
public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
{
$output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";

return $output;
return "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
}

/**
Expand Down

0 comments on commit 148e136

Please sign in to comment.