Commit 4fbf6ac0 authored by Tino Goratsch's avatar Tino Goratsch

- removed the Application::includeAutoloader() method and require the autoloader in the index.phps

parent 94cdb80a
......@@ -43,7 +43,6 @@ class Application
{
$this->defineDirConstants();
$this->startupChecks();
$this->includeAutoLoader();
$this->setErrorHandler();
$this->initializeClasses();
$this->outputPage();
......@@ -77,19 +76,10 @@ class Application
define('CLASSES_DIR', ACP3_DIR . 'Core/');
define('MODULES_DIR', ACP3_DIR . 'Modules/');
define('LIBRARIES_DIR', ACP3_ROOT_DIR . 'libraries/');
define('VENDOR_DIR', ACP3_ROOT_DIR . 'vendor/');
define('UPLOADS_DIR', ACP3_ROOT_DIR . 'uploads/');
define('CACHE_DIR', UPLOADS_DIR . 'cache/');
}
/**
* Klassen Autoloader inkludieren
*/
public function includeAutoLoader()
{
require VENDOR_DIR . 'autoload.php';
}
/**
* Set monolog as the default PHP error handler
*/
......
......@@ -7,7 +7,8 @@
define('IN_ACP3', true);
define('ACP3_ROOT_DIR', realpath(__DIR__) . '/');
require ACP3_ROOT_DIR . 'ACP3/Application.php';
require './vendor/autoload.php';
$application = new \ACP3\Application();
$application->run();
......@@ -30,7 +30,6 @@ class Application
$this->startupChecks();
}
$this->includeAutoLoader();
$this->initializeClasses();
$this->outputPage();
}
......@@ -48,7 +47,6 @@ class Application
define('CLASSES_DIR', ACP3_DIR . 'Core/');
define('MODULES_DIR', ACP3_DIR . 'Modules/');
define('LIBRARIES_DIR', ACP3_ROOT_DIR . 'libraries/');
define('VENDOR_DIR', ACP3_ROOT_DIR . 'vendor/');
define('UPLOADS_DIR', ACP3_ROOT_DIR . 'uploads/');
define('CACHE_DIR', UPLOADS_DIR . 'cache/');
......@@ -62,14 +60,6 @@ class Application
define('DESIGN_PATH_INTERNAL', INSTALLATION_DIR . 'design/');
}
/**
* Include class autoloader
*/
public function includeAutoLoader()
{
require VENDOR_DIR . 'autoload.php';
}
/**
* Initializes the classes
*/
......
......@@ -7,9 +7,9 @@
define('IN_ACP3', true);
define('IN_INSTALL', true);
define('ACP3_ROOT_DIR', realpath(__DIR__ . '/../') . '/');
require ACP3_ROOT_DIR . 'installation/Installer/Application.php';
require '../vendor/autoload.php';
$application = new \ACP3\Installer\Application();
$application->run();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment