From 26b4542b8e9a0a8f97d569288b6af20c2499b288 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Thu, 25 Jun 2009 12:03:38 -0400 Subject: [PATCH] Deprecated warning: Don't assign return value of new by reference. --- babel/edit.php | 6 +++--- babel/extract.php | 4 ++-- babel/lib/Babel.php | 2 +- babel/lib/Translate.php | 4 ++-- babel/lib/base.php | 2 +- babel/make.php | 4 ++-- babel/stats.php | 4 ++-- babel/upload.php | 4 ++-- babel/view.php | 8 ++++---- fima/lib/Driver.php | 6 +++--- fima/lib/Report.php | 8 ++++---- fima/lib/ReportGraph.php | 8 ++++---- framework/Image/tests/gd.php | 2 +- framework/Image/tests/svg.php | 2 +- framework/Image/tests/swf.php | 2 +- imp/compose-mimp.php | 2 +- ingo/lib/Script/procmail.php | 2 +- ingo/lib/Storage.php | 4 ++-- ingo/lib/Storage/mock.php | 2 +- ingo/lib/tests/MaildropTest.php | 12 ++++++------ ingo/lib/tests/ProcmailTest.php | 16 ++++++++-------- ingo/lib/tests/SieveTest.php | 16 ++++++++-------- kronolith/lib/Storage.php | 4 ++-- news/diff.php | 2 +- skoli/lib/Driver.php | 8 ++++---- timeobjects/lib/Driver.php | 2 +- 26 files changed, 68 insertions(+), 68 deletions(-) diff --git a/babel/edit.php b/babel/edit.php index dc2ccf2f9..4f6c298e5 100644 --- a/babel/edit.php +++ b/babel/edit.php @@ -39,7 +39,7 @@ $vars = &Horde_Variables::getDefaultVariables(); if ($app) { $napp = ($app == 'horde') ? '' : $app; $pofile = HORDE_BASE . '/' . $napp . '/po/' . $_SESSION['babel']['language'] . '.po'; - $po = &new File_Gettext_PO(); + $po = new File_Gettext_PO(); $po->load($pofile); } @@ -48,7 +48,7 @@ $template->set('menu', Babel::getMenu('string')); $template->set('notify', Horde_Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status'))); /* Create upload form */ -$form = &new Horde_Form($vars, _("Edit Translation"), $show); +$form = new Horde_Form($vars, _("Edit Translation"), $show); /* Validate form if submitted */ if ($app && Horde_Util::getFormData('submitbutton') == _("Save")) { @@ -102,7 +102,7 @@ require BABEL_TEMPLATES . '/common-header.inc'; echo $template->fetch(BABEL_TEMPLATES . '/layout.html'); $renderer_params = array(); -$renderer = &new Horde_Form_Renderer($renderer_params); +$renderer = new Horde_Form_Renderer($renderer_params); $renderer->setAttrColumnWidth('20%'); $form->renderActive($renderer, $vars, Horde::selfURL(), 'post'); diff --git a/babel/extract.php b/babel/extract.php index 2c60a5c20..1ec6495a2 100644 --- a/babel/extract.php +++ b/babel/extract.php @@ -30,7 +30,7 @@ echo $template->fetch(BABEL_TEMPLATES . '/layout.html'); $vars = &Horde_Variables::getDefaultVariables(); /* Create upload form */ -$form = &new Horde_Form($vars, _("Extract Translation"), 'extract'); +$form = new Horde_Form($vars, _("Extract Translation"), 'extract'); if (!$app) { $form->setButtons(_("Extract")); @@ -38,7 +38,7 @@ if (!$app) { $form->addVariable('', '', 'spacer', true); $renderer_params = array(); - $renderer = &new Horde_Form_Renderer($renderer_params); + $renderer = new Horde_Form_Renderer($renderer_params); $renderer->setAttrColumnWidth('20%'); $form->renderActive($renderer, $vars, Horde::selfURL(), 'post'); diff --git a/babel/lib/Babel.php b/babel/lib/Babel.php index cae684e0a..08d7c61f2 100644 --- a/babel/lib/Babel.php +++ b/babel/lib/Babel.php @@ -190,7 +190,7 @@ class Babel { { global $registry; - $menu = &new Horde_Menu(); + $menu = new Horde_Menu(); $menu->addArray(array('url' => Horde::applicationUrl('index.php'), 'text' => _("_General"), diff --git a/babel/lib/Translate.php b/babel/lib/Translate.php index d33382aec..5845e1751 100644 --- a/babel/lib/Translate.php +++ b/babel/lib/Translate.php @@ -40,7 +40,7 @@ class Translate { $pofile = $dir . "/$file"; - $tmppo = &new File_Gettext_PO(); + $tmppo = new File_Gettext_PO(); $tmppo->load($pofile); $fuzzy = 0; $untranslated = 0; @@ -135,7 +135,7 @@ class Translate { { static $ff; if (!isset($ff)) { - $ff = &new File_Find(); + $ff = new File_Find(); } if (substr($file, 0, 1) != '/') { diff --git a/babel/lib/base.php b/babel/lib/base.php index eb1627fb6..da72d1f6e 100644 --- a/babel/lib/base.php +++ b/babel/lib/base.php @@ -59,7 +59,7 @@ require_once 'Horde/UI/Pager.php'; /* Templates */ require_once 'Horde/Template.php'; -$template = &new Horde_Template(); +$template = new Horde_Template(); /* Module selection */ $app = Horde_Util::getFormData('module'); diff --git a/babel/make.php b/babel/make.php index cdd5b94f3..f87a50f9f 100644 --- a/babel/make.php +++ b/babel/make.php @@ -30,7 +30,7 @@ echo $template->fetch(BABEL_TEMPLATES . '/layout.html'); $vars = &Horde_Variables::getDefaultVariables(); /* Create upload form */ -$form = &new Horde_Form($vars, _("Make Translation"), 'make'); +$form = new Horde_Form($vars, _("Make Translation"), 'make'); if (!$app) { $form->setButtons(_("Make")); @@ -38,7 +38,7 @@ if (!$app) { $form->addVariable('', '', 'spacer', true); $renderer_params = array(); - $renderer = &new Horde_Form_Renderer($renderer_params); + $renderer = new Horde_Form_Renderer($renderer_params); $renderer->setAttrColumnWidth('20%'); $form->renderActive($renderer, $vars, Horde::selfURL(), 'post'); diff --git a/babel/stats.php b/babel/stats.php index 5fa4dbb62..08c9a534d 100644 --- a/babel/stats.php +++ b/babel/stats.php @@ -26,7 +26,7 @@ echo $template->fetch(BABEL_TEMPLATES . '/layout.html'); $vars = &Horde_Variables::getDefaultVariables(); /* Create upload form */ -$form = &new Horde_Form($vars, _("View Statistics"), 'stats'); +$form = new Horde_Form($vars, _("View Statistics"), 'stats'); if (!$app) { $form->setButtons(_("View")); @@ -34,7 +34,7 @@ if (!$app) { $form->addVariable('', '', 'spacer', true); $renderer_params = array(); - $renderer = &new Horde_Form_Renderer($renderer_params); + $renderer = new Horde_Form_Renderer($renderer_params); $renderer->setAttrColumnWidth('20%'); $form->renderActive($renderer, $vars, Horde::selfURL(), 'post'); diff --git a/babel/upload.php b/babel/upload.php index 95b87c597..7cbfa47c3 100644 --- a/babel/upload.php +++ b/babel/upload.php @@ -15,7 +15,7 @@ require_once BABEL_BASE . '/lib/base.php'; $vars = &Horde_Variables::getDefaultVariables(); /* Create upload form */ -$form = &new Horde_Form($vars, _("Upload new Translation"), 'upload'); +$form = new Horde_Form($vars, _("Upload new Translation"), 'upload'); $form->setButtons(_("Upload")); $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(true), true)); $form->addVariable(_("Translations File (.PO)"), 'po_file', 'file', true, false); @@ -60,7 +60,7 @@ require BABEL_TEMPLATES . '/common-header.inc'; echo $template->fetch(BABEL_TEMPLATES . '/layout.html'); $renderer_params = array(); -$renderer = &new Horde_Form_Renderer($renderer_params); +$renderer = new Horde_Form_Renderer($renderer_params); $renderer->setAttrColumnWidth('20%'); $form->renderActive($renderer, $vars, Horde::selfURL(), 'post'); diff --git a/babel/view.php b/babel/view.php index 4a15d08f3..f05b15aea 100644 --- a/babel/view.php +++ b/babel/view.php @@ -58,7 +58,7 @@ if ($app) { $napp = ($app == 'horde') ? '' : $app; $pofile = HORDE_BASE . '/' . $napp . '/po/' . $lang . '.po'; - $po = &new File_Gettext_PO(); + $po = new File_Gettext_PO(); $po->load($pofile); // Set Scope @@ -146,7 +146,7 @@ $template->set('menu', Babel::getMenu('string')); $template->set('notify', Horde_Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status'))); /* Create upload form */ -$form = &new Horde_Form($vars, _("View Translation"), $show); +$form = new Horde_Form($vars, _("View Translation"), $show); if (!$app) { $form->setButtons(_("View")); @@ -154,7 +154,7 @@ if (!$app) { $form->addVariable('', '', 'spacer', true); $renderer_params = array(); - $renderer = &new Horde_Form_Renderer($renderer_params); + $renderer = new Horde_Form_Renderer($renderer_params); $renderer->setAttrColumnWidth('20%'); $form->renderActive($renderer, $vars, Horde::selfURL(), 'post'); @@ -488,7 +488,7 @@ $viewurl = Horde_Util::addParameter($viewurl, array('editmode' => $editmode, 'module' => $app, 'filter' => $filter, 'search' => $search)); - $pager = &new Horde_UI_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); + $pager = new Horde_UI_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); echo $pager->render($page, $numitem, $viewurl); ?> diff --git a/fima/lib/Driver.php b/fima/lib/Driver.php index 0a1822274..8c679a3d5 100644 --- a/fima/lib/Driver.php +++ b/fima/lib/Driver.php @@ -358,13 +358,13 @@ class Fima_Driver { require_once dirname(__FILE__) . '/Driver/' . $driver . '.php'; $class = 'Fima_Driver_' . $driver; if (class_exists($class)) { - $fima = &new $class($ledger, $params); + $fima = new $class($ledger, $params); $result = $fima->initialize(); if (is_a($result, 'PEAR_Error')) { - $fima =& new Fima_Driver($params, sprintf(_("The Finances backend is not currently available: %s"), $result->getMessage())); + $fima = new Fima_Driver($params, sprintf(_("The Finances backend is not currently available: %s"), $result->getMessage())); } } else { - $fima =& new Fima_Driver($params, sprintf(_("Unable to load the definition of %s."), $class)); + $fima = new Fima_Driver($params, sprintf(_("Unable to load the definition of %s."), $class)); } return $fima; diff --git a/fima/lib/Report.php b/fima/lib/Report.php index 7f87a815c..e6723d764 100644 --- a/fima/lib/Report.php +++ b/fima/lib/Report.php @@ -167,20 +167,20 @@ class Fima_Report { function &factory($driver = null, $params = null) { if ($driver === null) { - $report =& new Fima_Report($params, _("No report driver loaded")); + $report = new Fima_Report($params, _("No report driver loaded")); return $report; } require_once dirname(__FILE__) . '/Report/' . $driver . '.php'; $class = 'Fima_Report_' . $driver; if (class_exists($class)) { - $report = &new $class($params); + $report = new $class($params); $result = $report->initialize(); if (is_a($result, 'PEAR_Error')) { - $report =& new Fima_Report($params, sprintf(_("The Finances reports are not currently available: %s"), $result->getMessage())); + $report = new Fima_Report($params, sprintf(_("The Finances reports are not currently available: %s"), $result->getMessage())); } } else { - $report =& new Fima_Report($params, sprintf(_("Unable to load the definition of %s."), $class)); + $report = new Fima_Report($params, sprintf(_("Unable to load the definition of %s."), $class)); } return $report; diff --git a/fima/lib/ReportGraph.php b/fima/lib/ReportGraph.php index 1f2f3ba53..44d723615 100644 --- a/fima/lib/ReportGraph.php +++ b/fima/lib/ReportGraph.php @@ -172,20 +172,20 @@ class Fima_ReportGraph { function &factory($driver = null, $data = null, $params = null) { if ($driver === null) { - $report =& new Fima_ReportGraph($data, $params, _("No report driver loaded")); + $report = new Fima_ReportGraph($data, $params, _("No report driver loaded")); return $report; } require_once dirname(__FILE__) . '/ReportGraph/' . $driver . '.php'; $class = 'Fima_ReportGraph_' . $driver; if (class_exists($class)) { - $report = &new $class($data, $params); + $report = new $class($data, $params); $result = $report->initialize(); if (is_a($result, 'PEAR_Error')) { - $report =& new Fima_ReportGraph($data, $params, sprintf(_("The Finances report graphs are not currently available: %s"), $result->getMessage())); + $report = new Fima_ReportGraph($data, $params, sprintf(_("The Finances report graphs are not currently available: %s"), $result->getMessage())); } } else { - $report =& new Fima_ReportGraph($data, $params, sprintf(_("Unable to load the definition of %s."), $class)); + $report = new Fima_ReportGraph($data, $params, sprintf(_("Unable to load the definition of %s."), $class)); } return $report; diff --git a/framework/Image/tests/gd.php b/framework/Image/tests/gd.php index d29ad1255..c3f7c60e6 100644 --- a/framework/Image/tests/gd.php +++ b/framework/Image/tests/gd.php @@ -5,7 +5,7 @@ require_once dirname(__FILE__) . '/../Image/gd.php'; -$image = &new Horde_Image_gd(array('height' => 400, 'width' => 400)); +$image = new Horde_Image_gd(array('height' => 400, 'width' => 400)); $image->rectangle(30, 30, 100, 60, 'black', 'yellow'); $image->roundedRectangle(30, 30, 100, 60, 15, 'black', 'red'); diff --git a/framework/Image/tests/svg.php b/framework/Image/tests/svg.php index af44b65a4..154561e8e 100644 --- a/framework/Image/tests/svg.php +++ b/framework/Image/tests/svg.php @@ -5,7 +5,7 @@ require_once dirname(__FILE__) . '/../Image/svg.php'; -$image = &new Horde_Image_svg(array('height' => 400, 'width' => 400)); +$image = new Horde_Image_svg(array('height' => 400, 'width' => 400)); $image->rectangle(30, 30, 100, 60, 'black', 'yellow'); $image->roundedRectangle(30, 30, 100, 60, 15, 'black', 'red'); diff --git a/framework/Image/tests/swf.php b/framework/Image/tests/swf.php index 5a50d59ff..acd6740ea 100644 --- a/framework/Image/tests/swf.php +++ b/framework/Image/tests/swf.php @@ -5,7 +5,7 @@ require_once dirname(__FILE__) . '/../Image/swf.php'; -$image = &new Horde_Image_swf(array('height' => 400, 'width' => 400)); +$image = new Horde_Image_swf(array('height' => 400, 'width' => 400)); $image->rectangle(30, 30, 100, 60, 'black', 'yellow'); $image->roundedRectangle(30, 30, 100, 60, 15, 'black', 'red'); diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php index 1329cff0f..92b5f253d 100644 --- a/imp/compose-mimp.php +++ b/imp/compose-mimp.php @@ -250,7 +250,7 @@ foreach (array('to', 'cc', 'bcc', 'subject') as $val) { } } -$menu = &new Horde_Mobile_card('o', _("Menu")); +$menu = new Horde_Mobile_card('o', _("Menu")); $mset = &$menu->add(new Horde_Mobile_linkset()); MIMP::addMIMPMenu($mset, 'compose'); diff --git a/ingo/lib/Script/procmail.php b/ingo/lib/Script/procmail.php index 3efb674ee..5a980de07 100644 --- a/ingo/lib/Script/procmail.php +++ b/ingo/lib/Script/procmail.php @@ -181,7 +181,7 @@ class Ingo_Script_procmail extends Ingo_Script { $this->addItem(new Procmail_Comment($filter['name'], !empty($filter['disable']), true)); $loop = 0; foreach ($filter['conditions'] as $condition) { - $recipe = &new Procmail_Recipe($filter, $this->_params); + $recipe = new Procmail_Recipe($filter, $this->_params); if ($loop++) { $recipe->addFlag('E'); } diff --git a/ingo/lib/Storage.php b/ingo/lib/Storage.php index 53f2f891d..0e9a9ce29 100644 --- a/ingo/lib/Storage.php +++ b/ingo/lib/Storage.php @@ -244,7 +244,7 @@ class Ingo_Storage */ public function getActionInfo($action) { - $ob = &new stdClass; + $ob = new stdClass; $ob->flags = false; $ob->type = 'text'; @@ -352,7 +352,7 @@ class Ingo_Storage ); /* Create the information object. */ - $ob = &new stdClass; + $ob = new stdClass; $ob->label = $labels[$test]; foreach ($types as $key => $val) { if (in_array($test, $val)) { diff --git a/ingo/lib/Storage/mock.php b/ingo/lib/Storage/mock.php index 10a540927..aeafa9986 100644 --- a/ingo/lib/Storage/mock.php +++ b/ingo/lib/Storage/mock.php @@ -22,7 +22,7 @@ class Ingo_Storage_mock extends Ingo_Storage return new Ingo_Storage_blacklist(); case self::ACTION_FILTERS: - $ob = &new Ingo_Storage_filters(); + $ob = new Ingo_Storage_filters(); include INGO_BASE . '/config/prefs.php.dist'; $ob->setFilterList(unserialize($_prefs['rules']['value'])); return $ob; diff --git a/ingo/lib/tests/MaildropTest.php b/ingo/lib/tests/MaildropTest.php index 3e4f5a0c2..a6b7ca9b9 100644 --- a/ingo/lib/tests/MaildropTest.php +++ b/ingo/lib/tests/MaildropTest.php @@ -29,7 +29,7 @@ class Ingo_MaildropTest extends Ingo_TestBase { function testForwardKeep() { - $forward = &new Ingo_Storage_forward(); + $forward = new Ingo_Storage_forward(); $forward->setForwardAddresses('joefabetes@example.com'); $forward->setForwardKeep(true); @@ -45,7 +45,7 @@ to "${DEFAULT}" function testForwardNoKeep() { - $forward = &new Ingo_Storage_forward(); + $forward = new Ingo_Storage_forward(); $forward->setForwardAddresses('joefabetes@example.com'); $forward->setForwardKeep(false); @@ -61,7 +61,7 @@ exit function testBlacklistWithFolder() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder('Junk'); @@ -76,7 +76,7 @@ to Junk function testBlacklistMarker() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder(Ingo::BLACKLIST_MARKER); @@ -91,7 +91,7 @@ to ++DELETE++ function testBlacklistDiscard() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder(null); @@ -106,7 +106,7 @@ to "/dev/null" function testWhitelist() { - $wl = &new Ingo_Storage_whitelist(3); + $wl = new Ingo_Storage_whitelist(3); $wl->setWhitelist(array('spammer@example.com')); $this->store($wl); diff --git a/ingo/lib/tests/ProcmailTest.php b/ingo/lib/tests/ProcmailTest.php index e62d9886c..a4e8818f0 100644 --- a/ingo/lib/tests/ProcmailTest.php +++ b/ingo/lib/tests/ProcmailTest.php @@ -33,7 +33,7 @@ class Ingo_ProcmailTest extends Ingo_TestBase { function testForwardKeep() { - $forward = &new Ingo_Storage_forward(); + $forward = new Ingo_Storage_forward(); $forward->setForwardAddresses('joefabetes@example.com'); $forward->setForwardKeep(true); @@ -65,7 +65,7 @@ $DEFAULT function testForwardNoKeep() { - $forward = &new Ingo_Storage_forward(); + $forward = new Ingo_Storage_forward(); $forward->setForwardAddresses('joefabetes@example.com'); $forward->setForwardKeep(false); @@ -97,7 +97,7 @@ $DEFAULT function testBlacklistWithFolder() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder('Junk'); @@ -109,7 +109,7 @@ Junk'); function testBlacklistMarker() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder(Ingo::BLACKLIST_MARKER); @@ -121,7 +121,7 @@ Junk'); function testBlacklistDiscard() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder(null); @@ -133,7 +133,7 @@ Junk'); function testWhitelist() { - $wl = &new Ingo_Storage_whitelist(3); + $wl = new Ingo_Storage_whitelist(3); $wl->setWhitelist(array('spammer@example.com')); $this->store($wl); @@ -144,7 +144,7 @@ $DEFAULT'); function testVacationDisabled() { - $vacation = &new Ingo_Storage_vacation(); + $vacation = new Ingo_Storage_vacation(); $vacation->setVacationAddresses(array('from@example.com')); $vacation->setVacationSubject('Subject'); $vacation->setVacationReason("Because I don't like working!"); @@ -155,7 +155,7 @@ $DEFAULT'); function testVacationEnabled() { - $vacation = &new Ingo_Storage_vacation(); + $vacation = new Ingo_Storage_vacation(); $vacation->setVacationAddresses(array('from@example.com')); $vacation->setVacationSubject('Subject'); $vacation->setVacationReason("Because I don't like working!"); diff --git a/ingo/lib/tests/SieveTest.php b/ingo/lib/tests/SieveTest.php index 6abf7b1bb..a71e1b8d0 100644 --- a/ingo/lib/tests/SieveTest.php +++ b/ingo/lib/tests/SieveTest.php @@ -32,7 +32,7 @@ class Ingo_SieveTest extends Ingo_TestBase { function testForwardKeep() { - $forward = &new Ingo_Storage_forward(); + $forward = new Ingo_Storage_forward(); $forward->setForwardAddresses('joefabetes@example.com'); $forward->setForwardKeep(true); @@ -45,7 +45,7 @@ keep; function testForwardNoKeep() { - $forward = &new Ingo_Storage_forward(); + $forward = new Ingo_Storage_forward(); $forward->setForwardAddresses('joefabetes@example.com'); $forward->setForwardKeep(false); @@ -57,7 +57,7 @@ redirect "joefabetes@example.com"; function testBlacklistMarker() { - $bl = &new Ingo_Storage_blacklist(3); + $bl = new Ingo_Storage_blacklist(3); $bl->setBlacklist(array('spammer@example.com')); $bl->setBlacklistFolder(Ingo::BLACKLIST_MARKER); @@ -73,7 +73,7 @@ stop; function testWhitelist() { - $wl = &new Ingo_Storage_whitelist(3); + $wl = new Ingo_Storage_whitelist(3); $wl->setWhitelist(array('spammer@example.com')); $this->store($wl); @@ -85,7 +85,7 @@ stop; function testVacationDisabled() { - $vacation = &new Ingo_Storage_vacation(); + $vacation = new Ingo_Storage_vacation(); $vacation->setVacationAddresses(array('from@example.com')); $vacation->setVacationSubject('Subject'); $vacation->setVacationReason("Because I don't like working!"); @@ -96,7 +96,7 @@ stop; function testVacationEnabled() { - $vacation = &new Ingo_Storage_vacation(); + $vacation = new Ingo_Storage_vacation(); $vacation->setVacationAddresses(array('from@example.com')); $vacation->setVacationSubject('Subject'); $vacation->setVacationReason("Because I don't like working!"); @@ -112,7 +112,7 @@ vacation :days 7 :addresses "from@example.com" :subject "Subject" "Because I don function testSpamDisabled() { - $spam = &new Ingo_Storage_spam(); + $spam = new Ingo_Storage_spam(); $spam->setSpamLevel(7); $spam->setSpamFolder("Junk"); @@ -122,7 +122,7 @@ vacation :days 7 :addresses "from@example.com" :subject "Subject" "Because I don function testSpamEnabled() { - $spam = &new Ingo_Storage_spam(); + $spam = new Ingo_Storage_spam(); $spam->setSpamLevel(7); $spam->setSpamFolder("Junk"); diff --git a/kronolith/lib/Storage.php b/kronolith/lib/Storage.php index f2aaf6d7f..39586266e 100644 --- a/kronolith/lib/Storage.php +++ b/kronolith/lib/Storage.php @@ -53,7 +53,7 @@ class Kronolith_Storage { require_once dirname(__FILE__) . '/Storage/' . $driver . '.php'; $class = 'Kronolith_Storage_' . $driver; if (class_exists($class)) { - $driver = &new $class($user, $params); + $driver = new $class($user, $params); } else { $driver = PEAR::raiseError(sprintf(_("Unable to load the definition of %s."), $class)); return $driver; @@ -61,7 +61,7 @@ class Kronolith_Storage { $result = $driver->initialize(); if (is_a($result, 'PEAR_Error')) { - $driver = &new Kronolith_Storage($params); + $driver = new Kronolith_Storage($params); } return $driver; diff --git a/news/diff.php b/news/diff.php index 29aea36f4..226d9d79c 100644 --- a/news/diff.php +++ b/news/diff.php @@ -22,7 +22,7 @@ $version = Horde_Util::getFormData('version', 0); /* Set up the diff renderer. */ $render_type = Horde_Util::getFormData('render', 'inline'); $class = 'Text_Diff_Renderer_' . $render_type; -$renderer = &new $class(); +$renderer = new $class(); /* get current version content */ $current_data = array(); diff --git a/skoli/lib/Driver.php b/skoli/lib/Driver.php index 6c536cc60..7da684ae9 100644 --- a/skoli/lib/Driver.php +++ b/skoli/lib/Driver.php @@ -65,7 +65,7 @@ class Skoli_Driver { $classes = Skoli::listClasses(); } if ($class != '' && !isset($classes[$class])) { - $class = &new Skoli_Driver(sprintf(_("Access for class \"%s\" is denied"), $class)); + $class = new Skoli_Driver(sprintf(_("Access for class \"%s\" is denied"), $class)); return $class; } @@ -81,13 +81,13 @@ class Skoli_Driver { require_once dirname(__FILE__) . '/Driver/' . $driver . '.php'; $objclass = 'Skoli_Driver_' . $driver; if (class_exists($objclass)) { - $class = &new $objclass($class, $params); + $class = new $objclass($class, $params); $result = $class->initialize(); if (is_a($result, 'PEAR_Error')) { - $class = &new Skoli_Driver(sprintf(_("The School backend is not currently available: %s"), $result->getMessage())); + $class = new Skoli_Driver(sprintf(_("The School backend is not currently available: %s"), $result->getMessage())); } } else { - $class = &new Skoli_Driver(sprintf(_("Unable to load the definition of %s."), $objclass)); + $class = new Skoli_Driver(sprintf(_("Unable to load the definition of %s."), $objclass)); } return $class; diff --git a/timeobjects/lib/Driver.php b/timeobjects/lib/Driver.php index d62f257ae..ac14190aa 100644 --- a/timeobjects/lib/Driver.php +++ b/timeobjects/lib/Driver.php @@ -37,7 +37,7 @@ class TimeObjects_Driver { $class = 'TimeObjects_Driver_' . basename($name); if (class_exists($class)) { - $driver = &new $class($params); + $driver = new $class($params); } else { $driver = PEAR::raiseError(sprintf(_("Unable to load the definition of %s."), $class)); } -- 2.11.0