Merge branch '2.7' into 2.8

fabpot · fabpot · commit 9712282171d0 · 2017-06-16T14:27:32.000-07:00
* 2.7:
  Remove unused $loader variable
diff --git a/web/app_dev.php b/web/app_dev.php
@@ -18,8 +18,7 @@
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
 
-/** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+require __DIR__.'/../app/autoload.php';
 Debug::enable();
 
 $kernel = new AppKernel('dev', true);

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@`
`18`	`18`	`exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');`
`19`	`19`	`}`
`20`	`20`
`21`		`-/** @var \Composer\Autoload\ClassLoader $loader */`
`22`		`-$loader = require __DIR__.'/../app/autoload.php';`
	`21`	`+require __DIR__.'/../app/autoload.php';`
`23`	`22`	`Debug::enable();`
`24`	`23`
`25`	`24`	`$kernel = new AppKernel('dev', true);`