Merge branch hotfix/v2.5.1

Author: roadiz-ci

config/services.yaml

@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.5.0'
+    roadiz_core.cms_version: '2.5.1'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

src/Api/Filter/ArchiveFilter.php

@@ -72,11 +72,23 @@ protected function filterProperty(
             throw new InvalidArgumentException(sprintf('“%s” filter must be only used with a string value.', self::PARAMETER_ARCHIVE));
         }
 
-        $range = $this->normalizeFilteringDates($value[self::PARAMETER_ARCHIVE]);
+        $this->singleArchiveFilter(
+            $queryBuilder,
+            $queryNameGenerator,
+            $alias,
+            $field,
+            $value[self::PARAMETER_ARCHIVE],
+        );
+    }
 
-        if (null === $range || 2 !== count($range)) {
-            return;
-        }
+    protected function singleArchiveFilter(
+        QueryBuilder $queryBuilder,
+        QueryNameGeneratorInterface $queryNameGenerator,
+        string $alias,
+        string $field,
+        string $value,
+    ): void {
+        [$startDate, $endDate] = $this->normalizeFilteringDates($value);
 
         $valueParameter = $queryNameGenerator->generateParameterName($field);
         $queryBuilder->andWhere($queryBuilder->expr()->isNotNull(sprintf('%s.%s', $alias, $field)))
@@ -85,43 +97,43 @@ protected function filterProperty(
                 ':'.$valueParameter.'Start',
                 ':'.$valueParameter.'End'
             ))
-            ->setParameter($valueParameter.'Start', $range[0])
-            ->setParameter($valueParameter.'End', $range[1]);
+            ->setParameter($valueParameter.'Start', $startDate)
+            ->setParameter($valueParameter.'End', $endDate);
     }
 
     /**
      * Support archive parameter with year or year-month.
      *
-     * @return \DateTime[]|null
+     * @return array{\DateTime, \DateTime}
      *
      * @throws \Exception
      */
-    protected function normalizeFilteringDates(string $value): ?array
+    protected function normalizeFilteringDates(string $value): array
     {
         /*
          * Support archive parameter with year or year-month
          */
-        if (preg_match('#[0-9]{4}\-[0-9]{2}\-[0-9]{2}#', $value) > 0) {
+        if (preg_match('#^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$#', $value) > 0) {
             $startDate = new \DateTime($value.' 00:00:00');
             $endDate = clone $startDate;
             $endDate->add(new \DateInterval('P1D'));
 
             return [$startDate, $this->limitEndDate($endDate)];
-        } elseif (preg_match('#[0-9]{4}\-[0-9]{2}#', $value) > 0) {
+        } elseif (preg_match('#^[0-9]{4}\-[0-9]{2}$#', $value) > 0) {
             $startDate = new \DateTime($value.'-01 00:00:00');
             $endDate = clone $startDate;
             $endDate->add(new \DateInterval('P1M'));
 
             return [$startDate, $this->limitEndDate($endDate)];
-        } elseif (preg_match('#[0-9]{4}#', $value) > 0) {
+        } elseif (preg_match('#^[0-9]{4}$#', $value) > 0) {
             $startDate = new \DateTime($value.'-01-01 00:00:00');
             $endDate = clone $startDate;
             $endDate->add(new \DateInterval('P1Y'));
 
             return [$startDate, $this->limitEndDate($endDate)];
         }
 
-        return null;
+        throw new InvalidArgumentException(sprintf('“%s” filter must be a valid archive specification.', self::PARAMETER_ARCHIVE));
     }
 
     protected function limitEndDate(\DateTime $endDate): \DateTime