From 7fab4eb60c8cb30758344c1c560002fd527a3a23 Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Thu, 25 Jun 2009 11:01:23 -0400
Subject: [PATCH] Deprecated warning: Don't assign return value of new by
 reference.

---
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php         | 2 +-
 framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php    | 4 ++--
 framework/Kolab_Session/lib/Horde/Kolab/IMAP.php                 | 2 +-
 framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php            | 2 +-
 framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
index 2e541bf95..68ab7f6ae 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
@@ -253,7 +253,7 @@ class Horde_Kolab_Server_Object
         $result = Horde_Kolab_Server_Object::loadClass($type);
 
         if (class_exists($type)) {
-            $object = &new $type($storage, $uid, $data);
+            $object = new $type($storage, $uid, $data);
         } else {
             throw new Horde_Kolab_Server_Exception('Class definition of ' . $type . ' not found.');
         }
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php
index f7c01fb78..50e08486b 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php
@@ -42,7 +42,7 @@ class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server
      */
     protected function setUp()
     {
-        $this->_dummydb = &new DummyDB();
+        $this->_dummydb = new DummyDB();
     }
 
     /**
@@ -73,7 +73,7 @@ class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server
      */
     public function testConstructDn($dn, $data, $expect)
     {
-        $ko  = &new Horde_Kolab_Server_Object($this->_dummydb, $dn, $data);
+        $ko  = new Horde_Kolab_Server_Object($this->_dummydb, $dn, $data);
         $ndn = $ko->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_UID);
         $this->assertNoError($ndn);
         $this->assertEquals($expect, $ndn);
diff --git a/framework/Kolab_Session/lib/Horde/Kolab/IMAP.php b/framework/Kolab_Session/lib/Horde/Kolab/IMAP.php
index 0cdbededc..c3c17298c 100644
--- a/framework/Kolab_Session/lib/Horde/Kolab/IMAP.php
+++ b/framework/Kolab_Session/lib/Horde/Kolab/IMAP.php
@@ -128,7 +128,7 @@ class Horde_Kolab_IMAP
 
         $class = 'Horde_Kolab_IMAP_' . $driver;
         if (class_exists($class)) {
-            $driver = &new $class($server, $port);
+            $driver = new $class($server, $port);
         } else {
             return PEAR::raiseError(sprintf(_("Failed to load Kolab IMAP driver %s"), $driver));
         }
diff --git a/framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php b/framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php
index 17368ccf5..c80baa878 100644
--- a/framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php
+++ b/framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php
@@ -55,7 +55,7 @@ class Horde_Kolab_IMAP_pear extends Horde_Kolab_IMAP
             return true;
         }
 
-        $this->_imap = &new Net_IMAP($this->_server, $this->_port);
+        $this->_imap = new Net_IMAP($this->_server, $this->_port);
         $result = $this->_imap->login($login, $password, true, false);
         if (is_a($result, 'PEAR_Error')) {
             return $result;
diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php
index 73458480d..34d797812 100644
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php
@@ -66,7 +66,7 @@ class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Server
         $conf['kolab']['imap']['port']       = 200;
         $conf['kolab']['freebusy']['server'] = 'fb.example.com';
 
-        $session = &new Horde_Kolab_Session();
+        $session = new Horde_Kolab_Session();
         $params  = $session->getImapParams();
         if (is_a($params, 'PEAR_Error')) {
             $this->assertEquals('', $params->getMessage());
-- 
2.11.0