Merge branch '2.7' into 2.8

fabpot · fabpot · commit 3baab64f272f · 2015-08-24T08:37:50.000+02:00
* 2.7:
  fixed CS
  [DependencyInjection] Add missing file headers
  fixed typo
  made Symfony compatible with both Twig 1.x and 2.x
  [FrameworkBundle] Fix precedence of xdebug.file_link_format
diff --git a/Tests/Shell/CommandTest.php b/Tests/Shell/CommandTest.php
@@ -133,7 +133,7 @@ public function testGetMissingLabelException()
     public function testErrorHandler()
     {
         $cmd = Command::create();
-        $handler = function() { return 'error-handler'; };
+        $handler = function () { return 'error-handler'; };
         $cmd->setErrorHandler($handler);
 
         $this->assertSame($handler, $cmd->getErrorHandler());

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function testGetMissingLabelException()`
`133`	`133`	`public function testErrorHandler()`
`134`	`134`	`{`
`135`	`135`	`$cmd = Command::create();`
`136`		`- $handler = function() { return 'error-handler'; };`
	`136`	`+ $handler = function () { return 'error-handler'; };`
`137`	`137`	`$cmd->setErrorHandler($handler);`
`138`	`138`
`139`	`139`	`$this->assertSame($handler, $cmd->getErrorHandler());`