feature #1056 Remove app/autoload.php (BPScott)

fabpot · fabpot · commit d91e64276d91 · 2017-04-24T09:17:06.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- Remove app/autoload.php Now that symfony/symfony#21837 is merged, app/autoload.php can be removed and replaced with the standard Composer autoloader. ~WAIT! This can't be merged *just* yet, as it throws errors when running the `buildBootstrap` post install/update script. The fix for this is in sensiolabs/SensioDistributionBundle#313. That PR must be merged and this PR must be updated to use a version of SensioDistributionBundle that contains the fix before this is good to go.~ EDIT: sensiolabs/SensioDistributionBundle#313 is merged (as of 24/04), and this PR has been updated to use the latest version of SensioDistributionBundle. This is now good to merge Commits ------- 298f8b2 Remove app/autoload.php
diff --git a/app/autoload.php b/app/autoload.php
diff --git a/bin/console b/bin/console
@@ -13,7 +13,7 @@ use Symfony\Component\Debug\Debug;
 set_time_limit(0);
 
 /** @var Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+$loader = require __DIR__.'/../vendor/autoload.php';
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/orm": "^2.5",
         "incenteev/composer-parameter-handler": "^2.0",
-        "sensio/distribution-bundle": "^5.0",
+        "sensio/distribution-bundle": "^5.0.19",
         "sensio/framework-extra-bundle": "^3.0.2",
         "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,7 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="app/autoload.php"
+         bootstrap="vendor/autoload.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/web/app.php b/web/app.php
@@ -3,7 +3,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+$loader = require __DIR__.'/../vendor/autoload.php';
 if (PHP_VERSION_ID < 70000) {
     include_once __DIR__.'/../var/bootstrap.php.cache';
 }
diff --git a/web/app_dev.php b/web/app_dev.php
@@ -19,7 +19,7 @@
 }
 
 /** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+$loader = require __DIR__.'/../vendor/autoload.php';
 Debug::enable();
 
 $kernel = new AppKernel('dev', true);

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"`
`6`	`6`	`backupGlobals="false"`
`7`	`7`	`colors="true"`
`8`		`- bootstrap="app/autoload.php"`
	`8`	`+ bootstrap="vendor/autoload.php"`
`9`	`9`	`>`
`10`	`10`	`<php>`
`11`	`11`	`<ini name="error_reporting" value="-1" />`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`use Symfony\Component\HttpFoundation\Request;`
`4`	`4`
`5`	`5`	`/** @var \Composer\Autoload\ClassLoader $loader */`
`6`		`-$loader = require __DIR__.'/../app/autoload.php';`
	`6`	`+$loader = require __DIR__.'/../vendor/autoload.php';`
`7`	`7`	`if (PHP_VERSION_ID < 70000) {`
`8`	`8`	`include_once __DIR__.'/../var/bootstrap.php.cache';`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/** @var \Composer\Autoload\ClassLoader $loader */`
`22`		`-$loader = require __DIR__.'/../app/autoload.php';`
	`22`	`+$loader = require __DIR__.'/../vendor/autoload.php';`
`23`	`23`	`Debug::enable();`
`24`	`24`
`25`	`25`	`$kernel = new AppKernel('dev', true);`