From 135b921db75da5995eab7e36393ecd4d2b0bc66f Mon Sep 17 00:00:00 2001 From: Frédéric Guillot <fred@kanboard.net> Date: Tue, 4 Nov 2014 21:33:05 -0500 Subject: Switch to composer --- app/common.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'app/common.php') diff --git a/app/common.php b/app/common.php index 1ace3d81..613d4501 100644 --- a/app/common.php +++ b/app/common.php @@ -2,17 +2,7 @@ // Common file between cli and web interface -require __DIR__.'/Core/Loader.php'; -require __DIR__.'/helpers.php'; -require __DIR__.'/functions.php'; - -use Core\Loader; -use Core\Registry; - -// Include password_compat for PHP < 5.5 -if (version_compare(PHP_VERSION, '5.5.0', '<')) { - require __DIR__.'/../vendor/password.php'; -} +require 'vendor/autoload.php'; // Include custom config file if (file_exists('config.php')) { @@ -21,12 +11,7 @@ if (file_exists('config.php')) { require __DIR__.'/constants.php'; -$loader = new Loader; -$loader->setPath('app'); -$loader->setPath('vendor'); -$loader->execute(); - -$registry = new Registry; +$registry = new Core\Registry; $registry->db = setup_db(); $registry->event = setup_events(); $registry->mailer = function() { return setup_mailer(); }; -- cgit v1.2.3