summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-08-19 11:33:21 (GMT)
committerThomas Bruederli <thomas@roundcube.net>2014-08-19 11:33:21 (GMT)
commitb86d6d05973920954d65e9705680c85596b72375 (patch)
tree7fd7fd06a44e3c05debdc1057679c7361874dfe1
parent823ae6ca32b98bd4927e8cbaae86eecffdabb3d5 (diff)
downloadkolab-freebusy-b86d6d05973920954d65e9705680c85596b72375.tar.gz
List PEAR packages in require-dev; let the autoloader search the include path for those packages remmoved in commit 823ae6ca.
Call `php composer.phar install --no-dev` to package without the PEAR dependencies.
-rw-r--r--composer.json4
-rw-r--r--public_html/index.php1
2 files changed, 5 insertions, 0 deletions
diff --git a/composer.json b/composer.json
index 731da78..d820de2 100644
--- a/composer.json
+++ b/composer.json
@@ -19,5 +19,9 @@
"desarrolla2/cache": "dev-master",
"sabre/vobject" : "2.0.*"
},
+ "require-dev": {
+ "kolab/Net_LDAP3": "dev-master",
+ "pear-pear/Net_LDAP2":">=2.0.12"
+ },
"minimum-stability": "dev"
}
diff --git a/public_html/index.php b/public_html/index.php
index 08bcbd9..d4fcee6 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -33,6 +33,7 @@ ini_set('error_reporting', E_ALL &~ E_NOTICE);
// use composer's autoloader for both dependencies and local lib
$loader = require_once(KOLAB_FREEBUSY_ROOT . '/vendor/autoload.php');
$loader->set('Kolab', array(KOLAB_FREEBUSY_ROOT . '/lib')); // register Kolab namespace
+$loader->setUseIncludePath(true); // enable searching the include_path (e.g. for PEAR packages)
use Kolab\Config;
use Kolab\FreeBusy\Utils;