Merge branch '2.3' into 2.7

fabpot · fabpot · commit f87f664a73d8 · 2016-01-27T06:09:39.000+01:00
* 2.3:
  Static code analysis
  Update AnnotationDirectoryLoader.php
  [FrameworkBundle] Fix template location for PHP templates
  [FrameworkBundle] Add path verification to the template parsing test cases
diff --git a/Dumper/PhpFileDumper.php b/Dumper/PhpFileDumper.php
@@ -25,9 +25,7 @@ class PhpFileDumper extends FileDumper
      */
     protected function format(MessageCatalogue $messages, $domain)
     {
-        $output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
-
-        return $output;
+        return "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ class PhpFileDumper extends FileDumper`
`25`	`25`	`*/`
`26`	`26`	`protected function format(MessageCatalogue $messages, $domain)`
`27`	`27`	`{`
`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";`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`/**`