From 06297b0bbb2c29d59d9c2abb5b794776d114a705 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Thu, 19 Feb 2009 12:55:34 -0500 Subject: [PATCH] use clone directly in H4 code, and use clone as a keyword instead of a function --- .../Date_Parser/lib/Horde/Date/Repeater/Day.php | 2 +- .../Date_Parser/lib/Horde/Date/Repeater/DayName.php | 2 +- .../Date_Parser/lib/Horde/Date/Repeater/Hour.php | 2 +- .../Date_Parser/lib/Horde/Date/Repeater/Minute.php | 6 +++--- .../Date_Parser/lib/Horde/Date/Repeater/Month.php | 2 +- .../Date_Parser/lib/Horde/Date/Repeater/Second.php | 6 +++--- .../Date_Parser/lib/Horde/Date/Repeater/Week.php | 4 ++-- .../Date_Parser/lib/Horde/Date/Repeater/Weekend.php | 2 +- framework/Rdo/lib/Horde/Rdo/Query.php | 2 +- kronolith/lib/Driver.php | 2 +- kronolith/lib/FreeBusy/View.php | 4 ++-- kronolith/lib/Kronolith.php | 20 ++++++++++---------- kronolith/lib/Views/Day.php | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Day.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Day.php index 08cad134e..f000b25b5 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Day.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Day.php @@ -17,7 +17,7 @@ class Horde_Date_Repeater_Day extends Horde_Date_Repeater $direction = ($pointer == 'future') ? 1 : -1; $this->currentDayStart->day += $direction; - $end = clone($this->currentDayStart); + $end = clone $this->currentDayStart; $end->day += 1; return new Horde_Date_Span($this->currentDayStart, $end); diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php b/framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php index 9cb50f65b..578b96680 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php @@ -29,7 +29,7 @@ class Horde_Date_Repeater_DayName extends Horde_Date_Repeater $this->currentDayStart->day += $direction * 7; } - $end = clone($this->currentDayStart); + $end = clone $this->currentDayStart; $end->day++; return new Horde_Date_Span($this->currentDayStart, $end); } diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php index e9ea26b5f..31b30b2f9 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php @@ -13,7 +13,7 @@ class Horde_Date_Repeater_Hour extends Horde_Date_Repeater } $this->currentHourStart->hour += $direction; - $end = clone($this->currentHourStart); + $end = clone $this->currentHourStart; $end->hour++; return new Horde_Date_Span($this->currentHourStart, $end); } diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php index 447825d51..2d162bd60 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php @@ -13,7 +13,7 @@ class Horde_Date_Repeater_Minute extends Horde_Date_Repeater $direction = ($pointer == 'future') ? 1 : -1; $this->currentMinuteStart->min += $direction; - $end = clone($this->currentMinuteStart); + $end = clone $this->currentMinuteStart; $end->min++; return new Horde_Date_Span($this->currentMinuteStart, $end); } @@ -24,13 +24,13 @@ class Horde_Date_Repeater_Minute extends Horde_Date_Repeater switch ($pointer) { case 'future': - $minuteBegin = clone($this->now); + $minuteBegin = clone $this->now; $minuteEnd = new Horde_Date(array('month' => $this->now->month, 'year' => $this->now->year, 'day' => $this->now->day, 'hour' => $this->now->hour, 'min' => $this->now->min)); break; case 'past': $minuteBegin = new Horde_Date(array('month' => $this->now->month, 'year' => $this->now->year, 'day' => $this->now->day, 'hour' => $this->now->hour, 'min' => $this->now->min)); - $minuteEnd = clone($this->now); + $minuteEnd = clone $this->now; break; case 'none': diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Month.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Month.php index fcb8f85cb..649fab72e 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Month.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Month.php @@ -18,7 +18,7 @@ class Horde_Date_Repeater_Month extends Horde_Date_Repeater $direction = ($pointer == 'future') ? 1 : -1; $this->currentMonthStart->month += $direction; - $end = clone($this->currentMonthStart); + $end = clone $this->currentMonthStart; $end->month++; return new Horde_Date_Span($this->currentMonthStart, $end); } diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Second.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Second.php index a789d3d9e..1e16b7ed6 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Second.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Second.php @@ -10,13 +10,13 @@ class Horde_Date_Repeater_Second extends Horde_Date_Repeater $direction = ($pointer == 'future') ? 1 : -1; if (!$this->secondStart) { - $this->secondStart = clone($this->now); + $this->secondStart = clone $this->now; $this->secondStart->sec += $direction; } else { $this->secondStart += $direction; } - $end = clone($this->secondStart); + $end = clone $this->secondStart; $end->sec++; return new Horde_Date_Span($this->secondStart, $end); } @@ -25,7 +25,7 @@ class Horde_Date_Repeater_Second extends Horde_Date_Repeater { parent::this($pointer); - $end = clone($this->now); + $end = clone $this->now; $end->sec++; return new Horde_Date_Span($this->now, $end); } diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Week.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Week.php index a88623e4c..ff16a6eb2 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Week.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Week.php @@ -23,7 +23,7 @@ class Horde_Date_Repeater_Week extends Horde_Date_Repeater case 'past': $sundayRepeater = new Horde_Date_Repeater_DayName('sunday'); - $sundayRepeater->now = clone($this->now); + $sundayRepeater->now = clone $this->now; $sundayRepeater->now->day++; $sundayRepeater->next('past'); $lastSundaySpan = $sundayRepeater->next('past'); @@ -64,7 +64,7 @@ class Horde_Date_Repeater_Week extends Horde_Date_Repeater $sundayRepeater->now = $this->now; $lastSundaySpan = $sundayRepeater->next('past'); $thisWeekStart = $lastSundaySpan->begin; - $thisWeekEnd = clone($thisWeekStart); + $thisWeekEnd = clone $thisWeekStart; $thisWeekEnd->day += 7; return new Horde_Date_Span($thisWeekStart, $thisWeekEnd); } diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php index 41024b6f2..0116f97b9 100644 --- a/framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php +++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php @@ -61,7 +61,7 @@ class Horde_Date_Repeater_Weekend extends Horde_Date_Repeater { $direction = ($pointer == 'future') ? 1 : -1; $weekend = new self(); - $weekend->now = clone($span->begin); + $weekend->now = clone $span->begin; $start = $weekend->next($pointer)->begin; $start->day += ($amount - 1) * $direction * 7; return new Horde_Date_Span($start, $start->add($span->width())); diff --git a/framework/Rdo/lib/Horde/Rdo/Query.php b/framework/Rdo/lib/Horde/Rdo/Query.php index 8108a5c55..be201a88a 100644 --- a/framework/Rdo/lib/Horde/Rdo/Query.php +++ b/framework/Rdo/lib/Horde/Rdo/Query.php @@ -67,7 +67,7 @@ class Horde_Rdo_Query { if ($query instanceof Horde_Rdo_Query || $query instanceof Horde_Rdo_Query_Literal) { - $query = clone($query); + $query = clone $query; if (!is_null($mapper)) { $query->setMapper($mapper); } diff --git a/kronolith/lib/Driver.php b/kronolith/lib/Driver.php index 1ab93ee92..964c65648 100644 --- a/kronolith/lib/Driver.php +++ b/kronolith/lib/Driver.php @@ -1209,7 +1209,7 @@ class Kronolith_Event { } $methods = !empty($this->methods) ? $this->methods : @unserialize($prefs->getValue('event_alarms')); - $start = Util::cloneObject($this->start); + $start = clone $this->start; $start->min -= $this->getAlarm(); if (isset($methods['notify'])) { $methods['notify']['show'] = array( diff --git a/kronolith/lib/FreeBusy/View.php b/kronolith/lib/FreeBusy/View.php index c05fa41d2..dc71d731a 100644 --- a/kronolith/lib/FreeBusy/View.php +++ b/kronolith/lib/FreeBusy/View.php @@ -24,12 +24,12 @@ class Kronolith_FreeBusy_View { function addRequiredMember($vFreebusy) { - $this->_requiredMembers[] = Util::cloneObject($vFreebusy); + $this->_requiredMembers[] = clone $vFreebusy; } function addOptionalMember($vFreebusy) { - $this->_optionalMembers[] = Util::cloneObject($vFreebusy); + $this->_optionalMembers[] = clone $vFreebusy; } function render($day = null) diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 63d75aa32..3ab7dce4b 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -1014,9 +1014,9 @@ class Kronolith { $eventIds = Kronolith::listEventIds($startDate, $endDate, $calendars, $alarmsOnly); - $startOfPeriod = Util::cloneObject($startDate); + $startOfPeriod = clone $startDate; $startOfPeriod->hour = $startOfPeriod->min = $startOfPeriod->sec = 0; - $endOfPeriod = Util::cloneObject($endDate); + $endOfPeriod = clone $endDate; $endOfPeriod->hour = 23; $endOfPeriod->min = $endOfPeriod->sec = 59; @@ -1255,7 +1255,7 @@ class Kronolith { /* Start searching for recurrences from the day after it * starts. */ - $next = Util::cloneObject($event->start); + $next = clone $event->start; ++$next->mday; } @@ -1264,7 +1264,7 @@ class Kronolith { while ($next !== false && $next->compareDate($endDate) <= 0) { if (!$event->recurrence->hasException($next->year, $next->month, $next->mday)) { /* Add the event to all the days it covers. */ - $nextEnd = Util::cloneObject($next); + $nextEnd = clone $next; $nextEnd->year += $diff[0]; $nextEnd->month += $diff[1]; $nextEnd->mday += $diff[2]; @@ -1286,15 +1286,15 @@ class Kronolith { /* Work out what day it starts on. */ if ($event->start->compareDateTime($startOfPeriod) < 0) { /* It started before the beginning of the period. */ - $eventStart = Util::cloneObject($startOfPeriod); + $eventStart = clone $startOfPeriod; } else { - $eventStart = Util::cloneObject($event->start); + $eventStart = clone $event->start; } /* Work out what day it ends on. */ if ($event->end->compareDateTime($endOfPeriod) > 0) { /* Ends after the end of the period. */ - $eventEnd = Util::cloneObject($event->end); + $eventEnd = clone $event->end; } else { /* If the event doesn't end at 12am set the end date to the * current end date. If it ends at 12am and does not end at @@ -1305,7 +1305,7 @@ class Kronolith { $event->end->sec != 0 || $event->start->compareDateTime($event->end) == 0 || $event->isAllDay()) { - $eventEnd = Util::cloneObject($event->end); + $eventEnd = clone $event->end; } else { $eventEnd = new Horde_Date( array('hour' => 23, @@ -1329,7 +1329,7 @@ class Kronolith { while ($loopDate->compareDateTime($eventEnd) <= 0) { if (!$event->isAllDay() || $loopDate->compareDateTime($eventEnd) != 0) { - $addEvent = Util::cloneObject($event); + $addEvent = clone $event; /* If this is the start day, set the start time to * the real start time, otherwise set it to @@ -1382,7 +1382,7 @@ class Kronolith { while ($loopDate->compareDateTime($eventEnd) <= 0) { if (!$event->isAllDay() || $loopDate->compareDateTime($eventEnd) != 0) { - $addEvent = Util::cloneObject($event); + $addEvent = clone $event; $addEvent->start = $eventStart; $addEvent->end = $eventEnd; $results[$loopDate->dateString()][$addEvent->getId()] = $addEvent; diff --git a/kronolith/lib/Views/Day.php b/kronolith/lib/Views/Day.php index bd5634a9e..edc615520 100644 --- a/kronolith/lib/Views/Day.php +++ b/kronolith/lib/Views/Day.php @@ -315,7 +315,7 @@ class Kronolith_View_Day extends Kronolith_Day { // All day events are easy; store them seperately. if ($event->isAllDay()) { - $this->_all_day_events[$cid][] = &Util::cloneObject($event); + $this->_all_day_events[$cid][] = clone $event; ++$this->_all_day_rowspan[$cid]; $this->_all_day_maxrowspan = max($this->_all_day_maxrowspan, $this->_all_day_rowspan[$cid]); } else { @@ -326,7 +326,7 @@ class Kronolith_View_Day extends Kronolith_Day { // Initialize this event's vertical span. $event->rowspan = 0; - $tmp[] = &Util::cloneObject($event); + $tmp[] = clone $event; } } $this->_events = $tmp; -- 2.11.0