From 5c78e751783b5519bcf9731d8ad195b668c2efa9 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Fri, 10 Dec 2010 05:39:54 +0100
Subject: [PATCH] Add optional Cli package. Add checks for optional packages.

---
 framework/Kolab_Format/lib/Horde/Kolab/Format/Cli.php     | 3 +++
 framework/Kolab_Format/lib/Horde/Kolab/Format/Factory.php | 3 +++
 framework/Kolab_Format/package.xml                        | 8 ++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Cli.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Cli.php
index a27a26729..e26148146 100644
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Cli.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Cli.php
@@ -42,6 +42,9 @@ class Horde_Kolab_Format_Cli
     {
         $parser = self::_prepareParser($parameters);
         if (empty($parameters['output'])) {
+            if (!class_exists('Horde_Cli')) {
+                throw new Horde_Kolab_Format_Exception('The Horde_Cli package seems to be missing (Class Horde_Cli is missing)!');
+            }
             $cli = Horde_Cli::init();
         } else {
             $cli = $parameters['output'];
diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Factory.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Factory.php
index b0380c078..ba9555abe 100644
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Factory.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Factory.php
@@ -92,6 +92,9 @@ class Horde_Kolab_Format_Factory
         } else {
             $handler = $this->create($format_type, $object_type, $params);
         }
+        if (!class_exists('Horde_Support_Timer')) {
+            throw new Horde_Kolab_Format_Exception('The Horde_Support package seems to be missing (Class Horde_Support_Timer is missing)!');
+        }
         return new Horde_Kolab_Format_Decorator_Timed(
             $handler,
             new Horde_Support_Timer(),
diff --git a/framework/Kolab_Format/package.xml b/framework/Kolab_Format/package.xml
index 66c9b48bd..fae382bbd 100644
--- a/framework/Kolab_Format/package.xml
+++ b/framework/Kolab_Format/package.xml
@@ -435,7 +435,11 @@
   </required>
   <optional>
    <package>
-    <name>Test</name>
+    <name>Cli</name>
+    <channel>pear.horde.org</channel>
+   </package>
+   <package>
+    <name>Date</name>
     <channel>pear.horde.org</channel>
    </package>
    <package>
@@ -443,7 +447,7 @@
     <channel>pear.horde.org</channel>
    </package>
    <package>
-    <name>Date</name>
+    <name>Test</name>
     <channel>pear.horde.org</channel>
    </package>
    <package>
-- 
2.11.0