Merge branch 'hotline#78773_bug_affichage_calendrier_sur_periode_octobre' into 'hotline'

hotline #78773 fix calendar days incrementation

See merge request !2792

VERSIONS_HOTLINE/78773

+ - ticket #78773 : Calendrier : correction de l'affichage des jours du mois de mars et du mois d'octobre dû aux changements d'heures effectués respectivement le 25 et le 28.
\ No newline at end of file

application/modules/opac/views/scripts/cms/calendar.phtml

-<?php 
+<?php
 echo $this->calendarContent($this->param);
-?>

library/ZendAfi/View/Helper/Calendar/Table.php

@@ -282,7 +282,7 @@ class ZendAfi_View_Helper_Calendar_Table extends ZendAfi_View_Helper_BaseHelper
 
 
   protected function getCalendarTableDays($articles) {
-    $first_month_day = mktime(0, 0, 0, $this->month, 1, $this->year);
+    $first_month_day = mktime(10, 0, 0, $this->month, 1, $this->year);
     $offset = (7 - (1 % 7 - date('w', $first_month_day))) % 7;
     $current_day = $first_month_day - 3600 * 24 * $offset;
     $row_number = ceil((date('t', $first_month_day) + $offset) / 7);

tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php

@@ -1046,4 +1046,27 @@ class CmsControllerCalendarActionWithOutDateTest extends AbstractControllerTestC
   public function gatArticleByPreferencesShouldBeCallWithEventDAteAfter() {
     $this->assertXPathContentContains('//div', 'Kitchen', $this->_response->getBody());
   }
+}
+
+
+
+
+class CmsControllerCalendarDuplicateDayDueToHourChangeTest extends CmsControllerCalendarActionTestCase {
+  public function setUp() {
+    parent::setUp();
+    ZendAfi_View_Helper_CalendarContent::setTimeSource(new TimeSourceForTest('2018-09-03 00:00:00'));
+    $this->dispatch('/cms/calendar/date/2018-10/render/ajax');
+  }
+
+
+  public function tearDown() {
+    ZendAfi_View_Helper_CalendarContent::setTimeSource(null);
+    parent::tearDown();
+  }
+
+
+  /** @test */
+  function day28ShouldBeDisplayOnlyOnce() {
+    $this->assertXPathCount('//td/span[contains(text(), "28")]', 1);
+  }
 }
\ No newline at end of file