From: Chuck Hagenbuch <chuck@horde.org>
Date: Mon, 28 Sep 2009 15:40:44 +0000 (-0400)
Subject: Remove references (&) that throw E_DEPRECATED errors
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=883ecb099ff6913a851ad42ed39956b2370a3a72;p=horde.git

Remove references (&) that throw E_DEPRECATED errors
---

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php
index d7a2188cd..ffff7aec0 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php
@@ -49,8 +49,8 @@ class Horde_Kolab_Storage_AttachmentTest extends Horde_Kolab_Storage_Scenario
         $world = $this->prepareBasicSetup();
 
         $this->storage = $this->authenticate($world['auth'],
-					     'wrobel@example.org',
-					     'none');
+                         'wrobel@example.org',
+                         'none');
 
         $this->folder = $this->prepareNewFolder($this->storage, 'Contacts', 'contact', true);
     }
@@ -71,7 +71,7 @@ class Horde_Kolab_Storage_AttachmentTest extends Horde_Kolab_Storage_Scenario
      */
     public function testCacheAttachmentInFile()
     {
-        $data = &new Horde_Kolab_Storage_Data('contact');
+        $data = new Horde_Kolab_Storage_Data('contact');
         $data->setFolder($this->folder);
 
         $atc1 = Horde_Util::getTempFile();
@@ -103,7 +103,7 @@ class Horde_Kolab_Storage_AttachmentTest extends Horde_Kolab_Storage_Scenario
      */
     public function testCacheAttachmentAsContent()
     {
-        $data = &new Horde_Kolab_Storage_Data('contact');
+        $data = new Horde_Kolab_Storage_Data('contact');
         $data->setFolder($this->folder);
 
         $object = array('uid' => '1',
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/DataTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/DataTest.php
index fb562ac0e..d6739cff9 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/DataTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/DataTest.php
@@ -41,8 +41,8 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
         $world = $this->prepareBasicSetup();
 
         $this->storage = $this->authenticate($world['auth'],
-					     'wrobel@example.org',
-					     'none');
+                         'wrobel@example.org',
+                         'none');
 
         $this->folder = $this->prepareNewFolder($this->storage, 'Contacts', 'contact', true);
         $this->prepareNewFolder($this->storage, 'NewContacts', 'contact');
@@ -62,9 +62,9 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
      */
     public function testGetCacheKey()
     {
-        $data = &new Horde_Kolab_Storage_Data('test');
+        $data = new Horde_Kolab_Storage_Data('test');
 
-        $folder = &new Horde_Kolab_Storage_Folder('INBOX/Test');
+        $folder = new Horde_Kolab_Storage_Folder('INBOX/Test');
         $data->setFolder($folder);
         $this->assertEquals('user/wrobel/Test', $data->getCacheKey());
     }
@@ -74,7 +74,7 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
      */
     public function testDelete()
     {
-        $data = &new Horde_Kolab_Storage_Data('contact');
+        $data = new Horde_Kolab_Storage_Data('contact');
         $data->setFolder($this->folder);
 
         /**
@@ -110,7 +110,7 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
      */
     public function testMove()
     {
-        $data = &new Horde_Kolab_Storage_Data('contact');
+        $data = new Horde_Kolab_Storage_Data('contact');
         $folder = $this->storage->getFolder('INBOX/Contacts');
         $data->setFolder($folder);
         /**
@@ -121,7 +121,7 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
         $result = $data->getObjectIds();
         $data->expireCache();
 
-        $data2 = &new Horde_Kolab_Storage_Data('contact');
+        $data2 = new Horde_Kolab_Storage_Data('contact');
         $folder2 = $this->storage->getFolder('INBOX/NewContacts');
         $data2->setFolder($folder2);
         /**
@@ -162,7 +162,7 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
      */
     public function testSave()
     {
-        $data = &new Horde_Kolab_Storage_Data('contact');
+        $data = new Horde_Kolab_Storage_Data('contact');
         $data->setFolder($this->folder);
         /**
          * During testing we want to ensure that we do not access any
@@ -227,7 +227,7 @@ class Horde_Kolab_Storage_DataTest extends Horde_Kolab_Storage_Scenario
      */
     public function testObjectDeleteAll()
     {
-        $data = &new Horde_Kolab_Storage_Data('contact');
+        $data = new Horde_Kolab_Storage_Data('contact');
         $data->setFolder($this->folder);
         /**
          * During testing we want to ensure that we do not access any
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
index 52a784290..b27c3e851 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
@@ -41,8 +41,8 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
         $world = $this->prepareBasicSetup();
 
         $this->storage = $this->authenticate($world['auth'],
-					     'wrobel@example.org',
-					     'none');
+                         'wrobel@example.org',
+                         'none');
 
         $this->prepareNewFolder($this->storage, 'Contacts', 'contact', true);
         $this->prepareNewFolder($this->storage, 'NewContacts', 'contact');
@@ -53,7 +53,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testConstruct()
     {
-        $folder = &new Horde_Kolab_Storage_Folder('INBOX/Contacts');
+        $folder = new Horde_Kolab_Storage_Folder('INBOX/Contacts');
         $this->assertEquals('INBOX/Contacts', $folder->name);
         $this->assertTrue(is_array($folder->_data));
         $this->assertTrue(empty($folder->_data));
@@ -74,7 +74,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testSetName()
     {
-        $folder = &new Horde_Kolab_Storage_Folder('INBOX/Contacts');
+        $folder = new Horde_Kolab_Storage_Folder('INBOX/Contacts');
         $folder->setName('TestAÖÜ');
         $this->assertEquals(Horde_String::convertCharset('INBOX/TestAÖÜ', Horde_Nls::getCharset(), 'UTF7-IMAP'), $folder->new_name);
     }
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php
index 83bc566a8..5fcdafe8c 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php
@@ -38,8 +38,8 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
      */
     public function testConstruct()
     {
-        $folder = &new DummyFolder(null);
-        $perms = &new Horde_Kolab_Storage_Permission($folder);
+        $folder = new DummyFolder(null);
+        $perms = new Horde_Kolab_Storage_Permission($folder);
         $this->assertEquals(array(), $perms->get('perm'));
         $permissions =  array('users' =>
                               array(
@@ -49,7 +49,7 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
                                   PERMS_EDIT |
                                   PERMS_DELETE
                               ));
-        $perms = &new Horde_Kolab_Storage_Permission($folder, $permissions);
+        $perms = new Horde_Kolab_Storage_Permission($folder, $permissions);
         $this->assertTrue(is_array($perms->get('perm')));
     }
 
@@ -61,7 +61,7 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
         $GLOBALS['conf']['auth']['driver'] = 'auto';
         $GLOBALS['conf']['group']['driver'] = 'mock';
 
-        $folder = &new DummyFolder(
+        $folder = new DummyFolder(
             array(
                 'wrobel' => 'lrid',
                 'reader' => 'lr',
@@ -72,8 +72,8 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
                 'group:editors' => 'lre'
             )
         );
-        $perms = &new Horde_Kolab_Storage_Permission($folder);
-	$data = $perms->getData();
+        $perms = new Horde_Kolab_Storage_Permission($folder);
+    $data = $perms->getData();
         $this->assertContains('users', array_keys($data));
         $this->assertContains('wrobel', array_keys($data['users']));
         $this->assertContains('reader', array_keys($data['users']));
@@ -90,7 +90,7 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
         $GLOBALS['conf']['auth']['driver'] = 'auto';
         $GLOBALS['conf']['group']['driver'] = 'mock';
 
-        $folder = &new DummyFolder(
+        $folder = new DummyFolder(
             array(
                 'wrobel' => 'lrid',
                 'reader' => 'lr',
@@ -102,8 +102,8 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
             ),
             'wrobel'
         );
-        $perms = &new Horde_Kolab_Storage_Permission($folder);
-	$data = $perms->getData();
+        $perms = new Horde_Kolab_Storage_Permission($folder);
+    $data = $perms->getData();
         unset($data['guest']);
         unset($data['default']);
         unset($data['users']['viewer']);
@@ -127,10 +127,10 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
         $GLOBALS['conf']['auth']['driver'] = 'auto';
         $GLOBALS['conf']['group']['driver'] = 'mock';
 
-        $folder = &new DummyFolder(array(), 'wrobel');
-        $hperms = &new Horde_Permission('test');
+        $folder = new DummyFolder(array(), 'wrobel');
+        $hperms = new Horde_Permission('test');
         $hperms->addUserPermission('wrobel', PERMS_SHOW, false);
-        $perms = &new Horde_Kolab_Storage_Permission($folder, $hperms->data);
+        $perms = new Horde_Kolab_Storage_Permission($folder, $hperms->data);
         $perms->save();
         $this->assertEquals('al', $folder->acl['wrobel']);
     }
@@ -154,7 +154,7 @@ class DummyFolder extends Horde_Kolab_Storage_Folder
 {
     var $acl;
     var $_owner;
-    function DummyFolder($acl, $owner = null) 
+    function DummyFolder($acl, $owner = null)
     {
         $this->acl = $acl;
         $this->_owner = $owner;