Merge pull request #192 from pronamic/191-number-of-periods-created-f…

…or-subscription-phase-should-not-count-outside-of-an-optional-phase-end-date

Fix calculated number of periods created falling outside optional phase end date.

src/Subscriptions/SubscriptionPhase.php

@@ -296,16 +296,22 @@ public function set_total_periods( $total_periods ) {
 	 * @return int
 	 */
 	public function get_periods_created() {
-		$next_date = $this->subscription->get_next_payment_date();
+		$next_payment_date = $this->subscription->get_next_payment_date();
 
-		if ( null === $next_date ) {
+		$end_date = $next_payment_date ?? $this->end_date;
+
+		if ( null === $end_date ) {
 			return 0;
 		}
 
+		if ( null !== $this->end_date && $end_date > $this->end_date ) {
+			$end_date = $this->end_date;
+		}
+
 		$period = new \DatePeriod(
 			new \DateTimeImmutable( $this->start_date->format( 'Y-m-d 00:00:00' ) ),
 			$this->interval,
-			new \DateTimeImmutable( $next_date->format( 'Y-m-d 00:00:00' ) )
+			new \DateTimeImmutable( $end_date->format( 'Y-m-d 00:00:00' ) )
 		);
 
 		return \iterator_count( $period );