summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-04-03 07:33:47 (GMT)
committerThomas Bruederli <thomas@roundcube.net>2014-04-03 07:33:47 (GMT)
commit8599e8f0925aa994fca1cc0530950ff8b97b1efb (patch)
tree0574f5766b63671e77b229d48ac2f27a406d18b9
parent8439c31736ca84a5d393b7c73f85a71126184aab (diff)
downloadkolab-freebusy-8599e8f0925aa994fca1cc0530950ff8b97b1efb.tar.gz
Add autoload configuration at runtime to work with a global composer repository; bump version
-rw-r--r--composer.json5
-rw-r--r--public_html/index.php7
2 files changed, 5 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 92a2823..769b88d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "kolab/free-busy",
"description": "Kolab Free/Busy Service",
"license": "AGPL-3.0",
- "version": "0.1.2",
+ "version": "0.1.3",
"repositories": [
{
"type": "pear",
@@ -13,9 +13,6 @@
"url": "git://git.kolab.org/git/pear/Net_LDAP3"
}
],
- "autoload": {
- "psr-0": { "": "lib/" }
- },
"require": {
"php": ">=5.3.3",
"monolog/monolog": "1.2.*",
diff --git a/public_html/index.php b/public_html/index.php
index fcbce69..14c549c 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -5,10 +5,10 @@
*
* This is the public API to provide Free/Busy information for Kolab users.
*
- * @version 0.1.2
+ * @version 0.1.3
* @author Thomas Bruederli <bruederli@kolabsys.com>
*
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -31,7 +31,8 @@ define('KOLAB_FREEBUSY_ROOT', realpath('../'));
ini_set('error_reporting', E_ALL &~ E_NOTICE);
// use composer's autoloader for both dependencies and local lib
-require_once KOLAB_FREEBUSY_ROOT . '/vendor/autoload.php';
+$loader = require_once(KOLAB_FREEBUSY_ROOT . '/vendor/autoload.php');
+$loader->set('Kolab', array(KOLAB_FREEBUSY_ROOT . '/lib')); // register Kolab namespace
use Kolab\Config;
use Kolab\FreeBusy\Utils;