Put the AzuraCast classes in the actual Composer autoloader, clean up other config files.
This commit is contained in:
parent
e9c62a3ea5
commit
eb4f9a041a
|
@ -42,7 +42,6 @@ if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']))
|
|||
|
||||
// Composer autoload.
|
||||
$autoloader = require(APP_INCLUDE_VENDOR . '/autoload.php');
|
||||
$autoloader->add('AzuraCast', APP_INCLUDE_LIB);
|
||||
|
||||
// Set up DI container.
|
||||
$app_settings = [
|
||||
|
@ -294,7 +293,7 @@ $cache = $di->get('cache');
|
|||
|
||||
if (!APP_IS_COMMAND_LINE || APP_TESTING_MODE)
|
||||
{
|
||||
/** @var \App\Customization $customization */
|
||||
/** @var \AzuraCast\Customization $customization */
|
||||
$customization = $di->get('customization');
|
||||
|
||||
// Set time zone.
|
||||
|
|
|
@ -32,10 +32,6 @@ $config = [
|
|||
],
|
||||
],
|
||||
|
||||
'pluginpaths' => [
|
||||
'DF\Application\Resource\\' => 'DF/Application/Resource',
|
||||
],
|
||||
|
||||
'autoload' => [
|
||||
'psr0' => [
|
||||
'Entity' => APP_INCLUDE_MODELS,
|
||||
|
@ -88,9 +84,6 @@ if (APP_APPLICATION_ENV != 'production')
|
|||
|
||||
// Update if your local configuration differs.
|
||||
$config['base_url'] = '//localhost:8080';
|
||||
|
||||
unset($config['api_url']);
|
||||
unset($config['upload_url']);
|
||||
}
|
||||
|
||||
return $config;
|
||||
|
|
|
@ -29,6 +29,11 @@
|
|||
"email": "buster@busterneece.com"
|
||||
}
|
||||
],
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"AzuraCast\\": "app/library/AzuraCast"
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
"preferred-install": "dist"
|
||||
},
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue