Skip to content

Commit

Permalink
Merge pull request BitBagCommerce#41 from pamil/remove-app-autoload
Browse files Browse the repository at this point in the history
Remove `app/autoload.php`
  • Loading branch information
pamil committed Sep 18, 2017
2 parents 4df70c4 + b1c436f commit ed2c553
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 18 deletions.
2 changes: 1 addition & 1 deletion behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ default:
kernel:
class: AppKernel
path: tests/Application/app/AppKernel.php
bootstrap: tests/Application/app/autoload.php
bootstrap: vendor/autoload.php

Lakion\Behat\MinkDebugExtension:
directory: etc/build
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@
"Acme\\ExamplePlugin\\": "src/",
"Tests\\Acme\\ExamplePlugin\\": "tests/"
}
},
"autoload-dev": {
"classmap": ["tests/Application/app/AppKernel.php"]
}
}
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="tests/Application/app/autoload.php">
bootstrap="vendor/autoload.php">
<testsuites>
<testsuite name="AcmeExamplePlugin Test Suite">
<directory>tests</directory>
Expand Down
12 changes: 0 additions & 12 deletions tests/Application/app/autoload.php

This file was deleted.

3 changes: 1 addition & 2 deletions tests/Application/bin/console
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ use Symfony\Component\Debug\Debug;

set_time_limit(0);

/** @var Composer\Autoload\ClassLoader $loader */
$loader = require __DIR__.'/../app/autoload.php';
require __DIR__ . '/../../../vendor/autoload.php';

$input = new ArgvInput();
$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
Expand Down
3 changes: 1 addition & 2 deletions tests/Application/web/app_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
use Symfony\Component\Debug\Debug;
use Symfony\Component\HttpFoundation\Request;

/** @var \Composer\Autoload\ClassLoader $loader */
$loader = require __DIR__.'/../app/autoload.php';
require __DIR__ . '/../../../vendor/autoload.php';

Debug::enable();

Expand Down

0 comments on commit ed2c553

Please sign in to comment.