Fix more referencing problems for the strict tests.

diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php
index 7f690cf..f421d9b 100644 (file)
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php
@@ -365,13 +365,13 @@ class Horde_Kolab_Format_Xml
      * @throws Horde_Kolab_Format_Exception If the class for the object type could
      *                         not be loaded.
      */
-    static public function &factory($object_type = '', $params = null)
+    static public function factory($object_type = '', $params = null)
     {
         $object_type = ucfirst(str_replace('-', '', $object_type));
         $class       = 'Horde_Kolab_Format_Xml_' . $object_type;
 
         if (class_exists($class)) {
-            $driver = &new $class($params);
+            $driver = new $class($params);
         } else {
             throw new Horde_Kolab_Format_Exception(sprintf(_("Failed to load Kolab XML driver %s"),
                                               $object_type));

diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php
index ff3dfcf..93e763e 100644 (file)
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php
@@ -386,14 +386,14 @@ class Horde_Kolab_Format_Xml_Contact extends Horde_Kolab_Format_Xml
     /**
      * Save the  specifc XML values.
      *
-     * @param array $root   The XML document root.
+     * @param array &$root   The XML document root.
      * @param array $object The resulting data array.
      *
      * @return boolean True on success.
      *
      * @throws Horde_Exception If converting the data to XML failed.
      */
-    protected function _save($root, $object)
+    protected function _save(&$root, $object)
     {
         // Handle name fields
         $name = array();

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
index ef9522e..fa94c30 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
@@ -699,11 +699,11 @@ class Horde_Kolab_Server_Object
     /**
      * Generates an ID for the given information.
      *
-     * @param array $info The data of the object.
+     * @param array &$info The data of the object.
      *
      * @return string The ID.
      */
-    public function generateId($info)
+    public function generateId(&$info)
     {
         if (!empty($info[self::ATTRIBUTE_ID])) {
             if (is_array($info[self::ATTRIBUTE_ID])) {

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Groupofnames.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Groupofnames.php
index eda44f3..908c3f6 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Groupofnames.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Groupofnames.php
@@ -73,13 +73,13 @@ class Horde_Kolab_Server_Object_Groupofnames extends Horde_Kolab_Server_Object
     /**
      * Generates an ID for the given information.
      *
-     * @param array $info The data of the object.
+     * @param array &$info The data of the object.
      *
      * @static
      *
      * @return string|PEAR_Error The ID.
      */
-    public function generateId($info)
+    public function generateId(&$info)
     {
         $id = $info[self::ATTRIBUTE_CN];
         if (is_array($id)) {

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab.php
index 39efbeb..73ef429 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab.php
@@ -80,13 +80,13 @@ class Horde_Kolab_Server_Object_Kolab extends Horde_Kolab_Server_Object_Groupofn
     /**
      * Generates an ID for the given information.
      *
-     * @param array $info The data of the object.
+     * @param array &$info The data of the object.
      *
      * @static
      *
      * @return string|PEAR_Error The ID.
      */
-    public function generateId($info)
+    public function generateId(&$info)
     {
         return self::ATTRIBUTE_K . '=kolab';
     }

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgermanbankarrangement.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgermanbankarrangement.php
index 4112e4b..65b27b8 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgermanbankarrangement.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgermanbankarrangement.php
@@ -92,7 +92,7 @@ class Horde_Kolab_Server_Object_Kolabgermanbankarrangement extends Horde_Kolab_S
     /**
      * Generates an ID for the given information.
      *
-     * @param array $info The data of the object.
+     * @param array &$info The data of the object.
      *
      * @static
      *

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabsharedfolder.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabsharedfolder.php
index b0e2351..4e4132b 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabsharedfolder.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabsharedfolder.php
@@ -79,13 +79,13 @@ class Horde_Kolab_Server_Object_Kolabsharedfolder extends Horde_Kolab_Server_Obj
     /**
      * Generates an ID for the given information.
      *
-     * @param array $info The data of the object.
+     * @param array &$info The data of the object.
      *
      * @static
      *
      * @return string|PEAR_Error The ID.
      */
-    public function generateId($info)
+    public function generateId(&$info)
     {
         return self::ATTRIBUTE_CN . '=' . $this->server->structure->quoteForUid(trim($info['cn'], " \t\n\r\0\x0B,"));
     }

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index a0f1aaf..9ee53c4 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -1236,7 +1236,7 @@ class Horde_Kolab_Storage_Folder
                         Horde_Auth::getAuth() => PERMS_SHOW | PERMS_READ |
                         PERMS_EDIT | PERMS_DELETE));
             }
-            $this->_perms = &new Horde_Kolab_Storage_Permission($this, $perms);
+            $this->_perms = new Horde_Kolab_Storage_Permission($this, $perms);
         }
         return $this->_perms;
     }
@@ -1257,9 +1257,9 @@ class Horde_Kolab_Storage_Folder
         }
 
         if (!is_a($perms, 'Horde_Permission_Kolab')) {
-            $this->_perms = &new Horde_Permission_Kolab($this, $perms->data);
+            $this->_perms = new Horde_Permission_Kolab($this, $perms->data);
         } else {
-            $this->_perms = &$perms;
+            $this->_perms = $perms;
             $this->_perms->setFolder($this);
         }