composer.json public_html/index.php

Thomas Brüderli bruederli at kolabsys.com
Tue Aug 19 13:43:01 CEST 2014


 composer.json         |    4 ++++
 public_html/index.php |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit b86d6d05973920954d65e9705680c85596b72375
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Aug 19 13:33:21 2014 +0200

    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.

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;




More information about the commits mailing list