From: Gunnar Wrobel <p@rdus.de>
Date: Fri, 2 Oct 2009 18:47:32 +0000 (+0200)
Subject: Fix more errors when running tests in strict mode.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e2d07a933b482b6199b1958df76c50e11a997f08;p=horde.git

Fix more errors when running tests in strict mode.
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
index c933c54c3..61aad377c 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
@@ -352,7 +352,7 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server
         if (isset($params['attributes'])) {
             $options['attributes'] = $params['attributes'];
         } else {
-            $options['attributes'] = $vars['_supported_attributes'];
+            $options['attributes'] = $this->getAttributes($type);
         }
 
         $data = $this->search($filter, $options, $base);
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
index fa94c30b5..c2a5a7167 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
@@ -385,7 +385,9 @@ class Horde_Kolab_Server_Object
     protected function _get($attr, $single = true)
     {
         if (isset($this->_cache[$attr])) {
-            if ($single && is_array($this->_cache[$attr])) {
+            if (empty($this->_cache[$attr])) {
+                return false;
+            } else if ($single && is_array($this->_cache[$attr])) {
                 return $this->_cache[$attr][0];
             } else {
                 return $this->_cache[$attr];
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php
index 27a25e9eb..1fd13d465 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php
@@ -91,7 +91,7 @@ class Horde_Kolab_Server_Object_Kolabgroupofnames extends Horde_Kolab_Server_Obj
         case self::ATTRIBUTE_VISIBILITY:
             //FIXME: This needs structural knowledge and should be in a
             //structural class.
-            return strpos($this->_uid, 'cn=internal') === false;
+            return strpos($this->uid, 'cn=internal') === false;
         default:
             return parent::derive($attr);
         }
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
index 5e49ab14a..d5213c25d 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
@@ -61,7 +61,7 @@ class Horde_Kolab_Server_AllTests
         // FIXME: This does not work yet, as we still have a number of
         //        static methods in basic Horde libraries that are not
         //        declared as such.
-        //error_reporting(E_ALL | E_STRICT);
+        error_reporting(E_ALL | E_STRICT);
 
         $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Kolab_Server');
 
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
index dc610d015..d23c7fd18 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
@@ -102,9 +102,6 @@ class Horde_Kolab_Server_UserTest extends Horde_Kolab_Server_Scenario
 
         $user = $this->server->fetch('cn=Gunnar Wrobel,dc=example,dc=org');
         $attr = $user->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_FREEBUSYHOST);
-        if (is_a($attr, 'PEAR_Error')) {
-            $this->assertEquals('', $attr->getMessage());
-        }
         $this->assertEquals('https://fb.example.org/freebusy', $attr);
 
         $imap = $user->getServer('freebusy');