From dd95737391656cae97061701c58aefae928387e9 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Tue, 3 Feb 2009 12:34:00 -0500
Subject: [PATCH] start moving repeaters to Horde_Date_Repeater

---
 framework/Date_Parser/lib/Horde/Date/Repeater.php  | 44 ++++++++++++++++++++++
 .../Date/{Parser/Locale/Base => }/Repeater/Day.php |  2 +-
 .../{Parser/Locale/Base => }/Repeater/DayName.php  |  2 +-
 .../Locale/Base => }/Repeater/DayPortion.php       |  6 +--
 .../lib/Horde/Date/Repeater/Exception.php          |  4 ++
 .../{Parser/Locale/Base => }/Repeater/Hour.php     |  2 +-
 .../{Parser/Locale/Base => }/Repeater/Minute.php   |  2 +-
 .../{Parser/Locale/Base => }/Repeater/Month.php    |  2 +-
 .../Locale/Base => }/Repeater/MonthName.php        |  9 +----
 .../{Parser/Locale/Base => }/Repeater/Season.php   |  6 +--
 .../Locale/Base => }/Repeater/SeasonName.php       |  6 +--
 .../{Parser/Locale/Base => }/Repeater/Second.php   |  2 +-
 .../{Parser/Locale/Base => }/Repeater/Time.php     |  6 +--
 .../{Parser/Locale/Base => }/Repeater/Week.php     | 24 ++++++------
 .../{Parser/Locale/Base => }/Repeater/Weekend.php  | 24 ++++++------
 .../{Parser/Locale/Base => }/Repeater/Year.php     |  2 +-
 16 files changed, 93 insertions(+), 50 deletions(-)
 create mode 100644 framework/Date_Parser/lib/Horde/Date/Repeater.php
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Day.php (95%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/DayName.php (94%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/DayPortion.php (95%)
 create mode 100644 framework/Date_Parser/lib/Horde/Date/Repeater/Exception.php
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Hour.php (95%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Minute.php (95%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Month.php (95%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/MonthName.php (93%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Season.php (65%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/SeasonName.php (72%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Second.php (91%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Time.php (94%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Week.php (72%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Weekend.php (70%)
 rename framework/Date_Parser/lib/Horde/Date/{Parser/Locale/Base => }/Repeater/Year.php (95%)

diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater.php b/framework/Date_Parser/lib/Horde/Date/Repeater.php
new file mode 100644
index 000000000..43ec167c8
--- /dev/null
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ */
+
+/**
+ */
+abstract class Horde_Date_Repeater
+{
+    /**
+     * returns the width (in seconds or months) of this repeatable.
+     */
+    abstract public function width();
+
+    /**
+     * returns the next occurance of this repeatable.
+     */
+    public function next($pointer)
+    {
+        if (is_null($this->now)) {
+            throw new Horde_Date_Repeater_Exception('Start point must be set before calling next()');
+        }
+
+        if (!in_array($pointer, array('future', 'none', 'past'))) {
+            throw new Horde_Date_Repeater_Exception("First argument 'pointer' must be one of 'past', 'future', 'none'");
+        }
+    }
+
+    public function this($pointer)
+    {
+        if (is_null($this->now)) {
+            throw new Horde_Date_Repeater_Exception('Start point must be set before calling this()');
+        }
+
+        if (!in_array($pointer, array('future', 'none', 'past'))) {
+            throw new Horde_Date_Repeater_Exception("First argument 'pointer' must be one of 'past', 'future', 'none'");
+        }
+    }
+
+    public function __toString()
+    {
+        return 'repeater';
+    }
+
+}
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Day.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Day.php
similarity index 95%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Day.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Day.php
index 98a3bc5ac..6b6ef051f 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Day.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Day.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Day extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Day extends Horde_Date_Repeater
 {
     // (24 * 60 * 60)
     const DAY_SECONDS = 86400;
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/DayName.php b/framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php
similarity index 94%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/DayName.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php
index 9ad629159..fe886e6b9 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/DayName.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/DayName.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_DayName extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_DayName extends Horde_Date_Repeater
 {
     // (24 * 60 * 60)
     const DAY_SECONDS = 86400;
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/DayPortion.php b/framework/Date_Parser/lib/Horde/Date/Repeater/DayPortion.php
similarity index 95%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/DayPortion.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/DayPortion.php
index 153db39ba..e03a637a8 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/DayPortion.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/DayPortion.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_DayPortion extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_DayPortion extends Horde_Date_Repeater
 {
     /**
      * 6am-12am (6 * 60 * 60, 12 * 60 * 60)
@@ -118,13 +118,13 @@ class Horde_Date_Parser_Locale_Base_Repeater_DayPortion extends Horde_Date_Parse
         $this->now = $span->begin;
         $portionSpan = $this->next($pointer);
         $direction = ($pointer == 'future') ? 1 : -1;
-        return $portionSpan + ($direction * ($amount - 1) * Horde_Date_Parser_Locale_Base_Repeater_Day::DAY_SECONDS);
+        return $portionSpan + ($direction * ($amount - 1) * Horde_Date_Repeater_Day::DAY_SECONDS);
     }
 
     public function width()
     {
         if (!$this->range) {
-            throw new Horde_Date_Parser_Exception('Range has not been set');
+            throw new Horde_Date_Repeater_Exception('Range has not been set');
         }
 
         if ($this->currentSpan) {
diff --git a/framework/Date_Parser/lib/Horde/Date/Repeater/Exception.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Exception.php
new file mode 100644
index 000000000..0fb573e7a
--- /dev/null
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Exception.php
@@ -0,0 +1,4 @@
+<?php
+class Horde_Date_Repeater_Exception extends Exception
+{
+}
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Hour.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php
similarity index 95%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Hour.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php
index 598c004fb..e501a100e 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Hour.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Hour.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Hour extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Hour extends Horde_Date_Repeater
 {
     public $currentHourStart;
 
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Minute.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php
similarity index 95%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Minute.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php
index 679cdf901..447825d51 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Minute.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Minute.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Minute extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Minute extends Horde_Date_Repeater
 {
     public $currentMinuteStart;
 
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Month.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Month.php
similarity index 95%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Month.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Month.php
index 6e6ca92cf..fcb8f85cb 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Month.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Month.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Month extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Month extends Horde_Date_Repeater
 {
     /**
      * 30 * 24 * 60 * 60
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/MonthName.php b/framework/Date_Parser/lib/Horde/Date/Repeater/MonthName.php
similarity index 93%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/MonthName.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/MonthName.php
index 939f51dd8..e1f21e2ee 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/MonthName.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/MonthName.php
@@ -1,11 +1,6 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_MonthName extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_MonthName extends Horde_Date_Repeater
 {
-    /**
-     * 30 * 24 * 60 * 60
-     */
-    const MONTH_SECONDS = 2592000;
-
     public $currentMonthStart;
 
     public function next($pointer)
@@ -70,7 +65,7 @@ class Horde_Date_Parser_Locale_Base_Repeater_MonthName extends Horde_Date_Parser
 
     public function width()
     {
-        return self::MONTH_SECONDS;
+        return Horde_Date_Repeater_Month::MONTH_SECONDS;
     }
 
     public function index()
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Season.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Season.php
similarity index 65%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Season.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Season.php
index 1c57d1c2a..2ad200b95 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Season.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Season.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Season extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Season extends Horde_Date_Repeater
 {
     /**
      * 91 * 24 * 60 * 60
@@ -9,13 +9,13 @@ class Horde_Date_Parser_Locale_Base_Repeater_Season extends Horde_Date_Parser_Lo
     public function next($pointer)
     {
         parent::next($pointer);
-        throw new Horde_Date_Parser_Exception('Not implemented');
+        throw new Horde_Date_Repeater_Exception('Not implemented');
     }
 
     public function this($pointer = 'future')
     {
         parent::this($pointer);
-        throw new Horde_Date_Parser_Exception('Not implemented');
+        throw new Horde_Date_Repeater_Exception('Not implemented');
     }
 
     public function width()
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/SeasonName.php b/framework/Date_Parser/lib/Horde/Date/Repeater/SeasonName.php
similarity index 72%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/SeasonName.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/SeasonName.php
index 210332cfa..d462ce127 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/SeasonName.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/SeasonName.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_SeasonName extends Horde_Date_Parser_Locale_Base_Repeater_Season
+class Horde_Date_Repeater_SeasonName extends Horde_Date_Repeater_Season
 {
     /**
      * 91 * 24 * 60 * 60
@@ -14,13 +14,13 @@ class Horde_Date_Parser_Locale_Base_Repeater_SeasonName extends Horde_Date_Parse
     public function next($pointer)
     {
         parent::next($pointer);
-        throw new Horde_Date_Parser_Exception('Not implemented');
+        throw new Horde_Date_Repeater_Exception('Not implemented');
     }
 
     public function this($pointer = 'future')
     {
         parent::this($pointer);
-        throw new Horde_Date_Parser_Exception('Not implemented');
+        throw new Horde_Date_Repeater_Exception('Not implemented');
     }
 
     public function width()
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Second.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Second.php
similarity index 91%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Second.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Second.php
index a26bfe467..a789d3d9e 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Second.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Second.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Second extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Second extends Horde_Date_Repeater
 {
     public $secondStart;
 
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Time.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Time.php
similarity index 94%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Time.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Time.php
index 0c9de67e9..67147c1bb 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Time.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Time.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Time extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Time extends Horde_Date_Repeater
 {
     public $currentTime;
 
@@ -41,7 +41,7 @@ class Horde_Date_Parser_Locale_Base_Repeater_Time extends Horde_Date_Parser_Loca
             break;
 
         default:
-            throw new Horde_Date_Parser_Exception('Time cannot exceed six digits');
+            throw new Horde_Date_Repeater_Exception('Time cannot exceed six digits');
         }
     }
 
@@ -100,7 +100,7 @@ class Horde_Date_Parser_Locale_Base_Repeater_Time extends Horde_Date_Parser_Loca
             }
 
             if (!$this->currentTime) {
-                throw new Horde_Date_Parser_Exception('Current time cannot be null at this point');
+                throw new Horde_Date_Repeater_Exception('Current time cannot be null at this point');
             }
         }
 
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Week.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Week.php
similarity index 72%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Week.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Week.php
index 92f2b6ccd..9b80b785b 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Week.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Week.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Week extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Week extends Horde_Date_Repeater
 {
     /**
      * (7 * 24 * 60 * 60)
@@ -15,16 +15,16 @@ class Horde_Date_Parser_Locale_Base_Repeater_Week extends Horde_Date_Parser_Loca
         if (!$this->currentWeekStart) {
             switch ($pointer) {
             case 'future':
-                $sundayRepeater = new Horde_Date_Parser_Locale_Base_Repeater_DayName(Horde_Date::DATE_SUNDAY);
-                $sundayRepeater->start = $this->now;
+                $sundayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SUNDAY);
+                $sundayRepeater->now = $this->now;
                 $nextSundaySpan = $sundayRepeater->next('future');
                 $this->currentWeekStart = $nextSundaySpan->begin;
                 break;
 
             case 'past':
-                $sundayRepeater = new Horde_Date_Parser_Locale_Base_Repeater_DayName(Horde_Date::DATE_SUNDAY);
-                $sundayRepeater->start = clone($this->now);
-                $sundayRepeater->start->day++;
+                $sundayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SUNDAY);
+                $sundayRepeater->now = clone($this->now);
+                $sundayRepeater->now->day++;
                 $sundayRepeater->next('past');
                 $lastSundaySpan = $sundayRepeater->next('past');
                 $currentWeekStart = $lastSundaySpan->begin;
@@ -47,23 +47,23 @@ class Horde_Date_Parser_Locale_Base_Repeater_Week extends Horde_Date_Parser_Loca
         switch ($pointer) {
         case 'future':
             $thisWeekStart = new Horde_Date(array('year' => $now->year, 'month' => $now->month, 'day' => $now->day, 'hour' => $now->hour + 1));
-            $sundayRepeater = new Horde_Date_Parser_Locale_Base_Repeater_DayName(Horde_Date::DATE_SUNDAY);
-            $sundayRepeater->start = $this->now;
+            $sundayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SUNDAY);
+            $sundayRepeater->now = $this->now;
             $thisSundaySpan = $sundayRepeater->this('future');
             $thisWeekEnd = $thisSundaySpan->begin;
             return new Horde_Date_Span($thisWeekStart, $thisWeekEnd);
 
         case 'past':
             $thisWeekEnd = new Horde_Date(array('year' => $now->year, 'month' => $now->month, 'day' => $now->day, 'hour' => $now->hour));
-            $sundayRepeater = new Horde_Date_Parser_Locale_Base_Repeater_DayName(Horde_Date::DATE_SUNDAY);
-            $sundayRepeater->start = $this->now;
+            $sundayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SUNDAY);
+            $sundayRepeater->now = $this->now;
             $lastSundaySpan = $sundayRepeater->next('past');
             $thisWeekStart = $lastSundaySpan->begin;
             return new Horde_Date_Span($thisWeekStart, $thisWeekEnd);
 
         case 'none':
-            $sundayRepeater = new Horde_Date_Parser_Locale_Base_Repeater_DayName(Horde_Date::DATE_SUNDAY);
-            $sundayRepeater->start = $this->now;
+            $sundayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SUNDAY);
+            $sundayRepeater->now = $this->now;
             $lastSundaySpan = $sundayRepeater->next('past');
             $thisWeekStart = $lastSundaySpan->begin;
             $thisWeekEnd = clone($thisWeekStart);
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Weekend.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php
similarity index 70%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Weekend.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php
index 17b227e46..edc48fa95 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Weekend.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Weekend.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Weekend extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Weekend extends Horde_Date_Repeater
 {
     /**
      * (2 * 24 * 60 * 60)
@@ -15,16 +15,16 @@ class Horde_Date_Parser_Locale_Base_Repeater_Weekend extends Horde_Date_Parser_L
         if ($this->currentWeekStart) {
             switch ($pointer) {
             case 'future':
-                $saturdayRepeater = new Horde_Date_Locale_Base_Repeater_DayName(Horde_Date::DATE_SATURDAY);
-                $saturdayRepeater->start = $this->now;
+                $saturdayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SATURDAY);
+                $saturdayRepeater->now = $this->now;
                 $nextSaturdaySpan = $saturdayRepeater->next('future');
                 $this->currentWeekStart = $nextSaturdaySpan->begin;
                 break;
 
             case 'past':
-                $saturdayRepeater = new Horde_Date_Locale_Base_Repeater_DayName(Horde_Date::DATE_SATURDAY);
-                $saturdayRepeater->start = $this->now;
-                $saturdayRepeater->start->day++;
+                $saturdayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SATURDAY);
+                $saturdayRepeater->now = $this->now;
+                $saturdayRepeater->now->day++;
                 $lastSaturdaySpan = $saturdayRepeater->next('past');
                 $this->currentWeekStart = $lastSaturdaySpan->begin;
                 break;
@@ -46,16 +46,16 @@ class Horde_Date_Parser_Locale_Base_Repeater_Weekend extends Horde_Date_Parser_L
         switch ($pointer) {
         case 'future':
         case 'none':
-            $saturdayRepeater = new Horde_Date_Locale_Base_Repeater_DayName(Horde_Date::DATE_SATURDAY);
-            $saturdayRepeater->start = $this->now;
+            $saturdayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SATURDAY);
+            $saturdayRepeater->now = $this->now;
             $thisSaturdaySpan = $saturdayRepeater->this('future');
             $thisSaturdaySpanEnd = $thisSaturdaySpan->begin;
             $thisSaturdaySpanEnd->day += 2;
             return new Horde_Date_Span($thisSaturdaySpan->begin, $thisSaturdaySpanEnd);
 
         case 'past':
-            $saturdayRepeater = new Horde_Date_Locale_Base_Repeater_DayName(Horde_Date::DATE_SATURDAY);
-            $saturdayRepeater->start = $this->now;
+            $saturdayRepeater = new Horde_Date_Repeater_DayName(Horde_Date::DATE_SATURDAY);
+            $saturdayRepeater->now = $this->now;
             $lastSaturdaySpan = $saturdayRepeater->this('past');
             $lastSaturdaySpanEnd = $lastSaturdaySpan->begin;
             $lastSaturdaySpanEnd->day += 2;
@@ -66,8 +66,8 @@ class Horde_Date_Parser_Locale_Base_Repeater_Weekend extends Horde_Date_Parser_L
     public function offset($span, $amount, $pointer)
     {
         $direction = ($pointer == 'future') ? 1 : -1;
-        $weekend = new Horde_Date_Parser_Locale_Base_Repeater_Weekend('weekend');
-        $weekend->start = $span->begin;
+        $weekend = new Horde_Date_Repeater_Weekend('weekend');
+        $weekend->now = $span->begin;
         $start = $weekend->next($pointer)->begin;
         $start->day += ($amount - 1) * $direction * 7;
         // @FIXME
diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Year.php b/framework/Date_Parser/lib/Horde/Date/Repeater/Year.php
similarity index 95%
rename from framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Year.php
rename to framework/Date_Parser/lib/Horde/Date/Repeater/Year.php
index 87151f89d..ace5cdc20 100644
--- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater/Year.php
+++ b/framework/Date_Parser/lib/Horde/Date/Repeater/Year.php
@@ -1,5 +1,5 @@
 <?php
-class Horde_Date_Parser_Locale_Base_Repeater_Year extends Horde_Date_Parser_Locale_Base_Repeater
+class Horde_Date_Repeater_Year extends Horde_Date_Repeater
 {
     public $currentYearStart;
 
-- 
2.11.0