fix: fix error "date(): Argument #2 ($timestamp) must be of type ?int…

…, string given" fixes #19
cgoIT · Jul 15, 2024 · 4a69df7 · 4a69df7
1 parent 0c69189
commit 4a69df7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/src/Classes/Utils.php b/src/Classes/Utils.php
@@ -142,6 +142,37 @@ public static function appendToArrayKey(&$arr, mixed $key, mixed $val): void
         }
     }
 
+    /**
+     * @param array<mixed> $arrFixedDates
+     *
+     * @return array<mixed>
+     */
+    public static function sanitizeFixedDates(array $arrFixedDates): array
+    {
+        foreach ($arrFixedDates as $pos => &$fixedDate) {
+            foreach (['new_repeat', 'new_start', 'new_end'] as $col) {
+                $val = $fixedDate[$col];
+                if (!empty($val)) {
+                    if (!\is_int($val)) {
+                        $intVal = strtotime((string) $val);
+                        if (false !== $intVal) {
+                            $fixedDate[$col] = $intVal;
+                        } else {
+                            $fixedDate[$col] = 0;
+                        }
+                    }
+                } else {
+                    if ('new_repeat' === $col) {
+                        unset($arrFixedDates[$pos]);
+                        continue 2;
+                    }
+                }
+            }
+        }
+
+        return $arrFixedDates;
+    }
+
     /**
      * Implodes an array of fixed dates into a string.
      *

diff --git a/src/EventListener/DataContainer/CalendarEventsCallbacks.php b/src/EventListener/DataContainer/CalendarEventsCallbacks.php
@@ -14,6 +14,7 @@
 
 namespace Cgoit\CalendarExtendedBundle\EventListener\DataContainer;
 
+use Cgoit\CalendarExtendedBundle\Classes\Utils;
 use Cgoit\CalendarExtendedBundle\Exception\CalendarExtendedException;
 use Contao\Backend;
 use Contao\CalendarEventsModel;
@@ -261,35 +262,6 @@ public function defaultRepeatEachExt(mixed $value, DataContainer $dc): mixed
         return $value;
     }
 
-    /**
-     * @param array<mixed> $arrFixedDates
-     *
-     * @return array<mixed>
-     */
-    private function sanitizeFixedDates(array $arrFixedDates): array
-    {
-        foreach ($arrFixedDates as $pos => &$fixedDate) {
-            foreach (['new_repeat', 'new_start', 'new_end'] as $col) {
-                $val = $fixedDate[$col];
-                if (!empty($val)) {
-                    if (!\is_int($val)) {
-                        $intVal = strtotime((string) $val);
-                        if (false !== $intVal) {
-                            $fixedDate[$col] = $intVal;
-                        }
-                    }
-                } else {
-                    if ('new_repeat' === $col) {
-                        unset($arrFixedDates[$pos]);
-                        continue 2;
-                    }
-                }
-            }
-        }
-
-        return $arrFixedDates;
-    }
-
     /**
      * @param array<mixed> $arrAllRecurrences
      * @param array<mixed> $maxRepeatEnd
@@ -308,7 +280,7 @@ private function getFixedDates(Result|\stdClass $activeRecord, array $arrAllRecu
             return [null, $arrAllRecurrences, $maxRepeatEnd];
         }
 
-        $arrFixedDates = $this->sanitizeFixedDates($arrFixedDates);
+        $arrFixedDates = Utils::sanitizeFixedDates($arrFixedDates);
         usort(
             $arrFixedDates,
             static function ($a, $b) {

diff --git a/src/Hook/GetAllEventsHook.php b/src/Hook/GetAllEventsHook.php
@@ -184,6 +184,8 @@ private function handleFixedDatesRecurrences(array $arrEvents, array $arrCalenda
                 $arrFixedDates = StringUtil::deserialize($objEvent->repeatFixedDates);
 
                 if (!empty($arrFixedDates) && \is_array($arrFixedDates)) {
+                    $arrFixedDates = Utils::sanitizeFixedDates($arrFixedDates);
+
                     foreach ($arrFixedDates as $date) {
                         $intStart = $date['new_repeat'];
                         $intEnd = $intStart;