Added index property to Recurrence

src/Recurr/Recurrence.php

@@ -24,7 +24,10 @@ class Recurrence
     /** @var \DateTime */
     protected $end;
 
-    public function __construct(\DateTime $start = null, \DateTime $end = null)
+    /** @var int */
+    protected $index;
+
+    public function __construct(\DateTime $start = null, \DateTime $end = null, $index = 0)
     {
         if ($start instanceof \DateTime) {
             $this->setStart($start);
@@ -33,6 +36,8 @@ public function __construct(\DateTime $start = null, \DateTime $end = null)
         if ($end instanceof \DateTime) {
             $this->setEnd($end);
         }
+
+        $this->index = $index;
     }
 
     /**
@@ -66,4 +71,20 @@ public function setEnd($end)
     {
         $this->end = $end;
     }
+
+    /**
+     * @return int
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    /**
+     * @param int $index
+     */
+    public function setIndex($index)
+    {
+        $this->index = $index;
+    }
 }

src/Recurr/Transformer/ArrayTransformer.php

@@ -540,7 +540,7 @@ public function transform(Rule $rule, ConstraintInterface $constraint = null, $c
                             }
                         }
                     } else {
-                        $dates[] = $dtTmp;
+                        $dates[$total] = $dtTmp;
                     }
 
                     if (null !== $count) {
@@ -588,7 +588,7 @@ public function transform(Rule $rule, ConstraintInterface $constraint = null, $c
                                 }
                             }
                         } else {
-                            $dates[] = clone $dtTmp;
+                            $dates[$total] = clone $dtTmp;
                         }
 
                         if (null !== $count) {
@@ -685,11 +685,11 @@ public function transform(Rule $rule, ConstraintInterface $constraint = null, $c
 
         /** @var Recurrence[] $recurrences */
         $recurrences = array();
-        foreach ($dates as $start) {
+        foreach ($dates as $key => $start) {
             /** @var \DateTime $end */
             $end = clone $start;
 
-            $recurrences[] = new Recurrence($start, $end->add($durationInterval));
+            $recurrences[] = new Recurrence($start, $end->add($durationInterval), $key);
         }
 
         $recurrences = $this->handleInclusions($rule->getRDates(), $recurrences);

tests/Recurr/Test/Transformer/ArrayTransformerTest.php

@@ -101,4 +101,18 @@ public function testRfc2445Example()
         $this->assertEquals(new \DateTime('2003-01-12 08:30:00'), $computed[28]->getStart());
         $this->assertEquals(new \DateTime('2003-01-12 09:30:00'), $computed[29]->getStart());
     }
+
+    public function testIndex()
+    {
+        $rule = new Rule(
+            'FREQ=YEARLY;COUNT=10',
+            new \DateTime('2000-01-01 09:00:00')
+        );
+
+        $computed = $this->transformer->transform($rule);
+
+        $this->assertCount(10, $computed);
+        $this->assertEquals(1, $computed[0]->getIndex());
+        $this->assertEquals(10, $computed[9]->getIndex());
+    }
 }