fixed data manipulation

Author: konradoboza

phpstan-baseline.neon

@@ -6702,36 +6702,12 @@ parameters:
 			count: 1
 			path: src/lib/Form/DataTransformer/DateIntervalToArrayTransformer.php
 
-		-
-			message: '#^Call to function array_key_exists\(\) with ''date_interval'' and non\-empty\-array will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
-
-		-
-			message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
-
 		-
 			message: '#^Class Ibexa\\AdminUi\\Form\\DataTransformer\\DateIntervalTransformer implements generic interface Symfony\\Component\\Form\\DataTransformerInterface but does not specify its types\: T, R$#'
 			identifier: missingType.generics
 			count: 1
 			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
 
-		-
-			message: '#^Method Ibexa\\AdminUi\\Form\\DataTransformer\\DateIntervalTransformer\:\:reverseTransform\(\) has parameter \$value with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
-
-		-
-			message: '#^Method Ibexa\\AdminUi\\Form\\DataTransformer\\DateIntervalTransformer\:\:reverseTransform\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
-
 		-
 			message: '#^Method Ibexa\\AdminUi\\Form\\DataTransformer\\DateIntervalTransformer\:\:transform\(\) has Symfony\\Component\\Form\\Exception\\TransformationFailedException in PHPDoc @throws tag but it''s not thrown\.$#'
 			identifier: throws.unusedType
@@ -6750,6 +6726,12 @@ parameters:
 			count: 1
 			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
 
+		-
+			message: '#^Variable \$endDateTimestamp on left side of \?\? always exists and is not nullable\.$#'
+			identifier: nullCoalesce.variable
+			count: 1
+			path: src/lib/Form/DataTransformer/DateIntervalTransformer.php
+
 		-
 			message: '#^Class Ibexa\\AdminUi\\Form\\DataTransformer\\DateTimePickerTransformer implements generic interface Symfony\\Component\\Form\\DataTransformerInterface but does not specify its types\: T, R$#'
 			identifier: missingType.generics

src/lib/Form/DataTransformer/DateIntervalTransformer.php

@@ -8,6 +8,8 @@
 
 namespace Ibexa\AdminUi\Form\DataTransformer;
 
+use DateInterval;
+use DateTime;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
@@ -29,40 +31,43 @@ public function transform($value)
     }
 
     /**
-     * @param array|null $value
-     *
-     * @return array|null
+     * @param array<mixed>|null $value
      *
-     * @throws \Exception
-     * @throws \Symfony\Component\Form\Exception\TransformationFailedException
-     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
-     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @return array<string, int>
      */
-    public function reverseTransform($value)
+    public function reverseTransform($value): array
     {
-        if (null === $value || !is_array($value) || empty($value['date_interval'])) {
+        if (!is_array($value)) {
             return [];
         }
 
-        if (!array_key_exists('date_interval', $value) || !array_key_exists('end_date', $value)) {
+        if (
+            !array_key_exists('date_interval', $value)
+            || !array_key_exists('start_date', $value)
+            || !array_key_exists('end_date', $value)
+        ) {
             throw new TransformationFailedException(
-                "Invalid data. Value array is missing 'date_interval' and/or 'end_date' keys"
+                "Invalid data. On of the array keys is missing 'date_interval', 'start_date' or 'end_date'"
             );
         }
 
-        $date = new \DateTime();
+        $startDateTimestamp = $value['start_date'] ?? null;
+        $endDateTimestamp = $value['end_date'] ?? null;
 
-        if ($value['end_date']) {
-            $date->setTimestamp($value['end_date']);
-        }
+        $dateInterval = $value['date_interval'];
+        if (!empty($dateInterval)) {
+            $interval = new DateInterval($dateInterval);
+
+            $date = new DateTime();
+            $endDateTimestamp = $date->getTimestamp();
 
-        $endDate = $date->getTimestamp();
-        $interval = new \DateInterval($value['date_interval']);
-        $date->sub($interval);
+            $date->setTimestamp($endDateTimestamp ?? $date->getTimestamp());
+            $date->sub($interval);
 
-        $startDate = $value['start_date'] ?? $date->getTimestamp();
+            $startDateTimestamp = $date->getTimestamp();
+        }
 
-        return ['start_date' => $startDate, 'end_date' => $endDate];
+        return ['start_date' => $startDateTimestamp, 'end_date' => $endDateTimestamp];
     }
 }