Merge branch '2.0' into api-platform-3

* 2.0:
  Add empty array check
  Revert conflict to twig/intl-extra

CONFLICTS.md

@@ -22,8 +22,3 @@ references related issues.
 
   This version has a bug, which lead to a fatal error:
   `An exception has been thrown during the rendering of a template ("Warning: Undefined variable $blocks").`
-
-- `twig/intl-extra:3.9.0`:
-
-  This version call function `dateConverter` which is only available in `twig/twig:3.9.0`, that leads to a fatal error:
-  `An exception has been thrown during the rendering of a template ("Call to undefined method Twig\Extension\CoreExtension::dateConverter()").`

composer.json

@@ -188,8 +188,7 @@
         "api-platform/core": "2.7.17",
         "doctrine/orm": ">= 2.16.0",
         "stof/doctrine-extensions-bundle": "1.8.0",
-        "twig/twig": "3.9.0",
-        "twig/intl-extra": "3.9.0"
+        "twig/twig": "3.9.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",

src/Sylius/Bundle/AddressingBundle/Repository/ZoneRepository.php

@@ -80,7 +80,9 @@ class ZoneRepository extends EntityRepository implements ZoneRepositoryInterface
             $queryBuilder->setParameter('provinceCode', $address->getProvinceCode());
         }
 
-        $queryBuilder->andWhere($queryBuilder->expr()->orX(...$orConditions));
+        if ($orConditions !== []) {
+            $queryBuilder->andWhere($queryBuilder->expr()->orX(...$orConditions));
+        }
 
         return $queryBuilder;
     }

src/Sylius/Bundle/AdminBundle/composer.json

@@ -50,8 +50,7 @@
         "symfony/dotenv": "^6.4.0"
     },
     "conflict": {
-        "twig/twig": "3.9.0",
-        "twig/intl-extra": "3.9.0"
+        "twig/twig": "3.9.0"
     },
     "config": {
         "allow-plugins": {

src/Sylius/Bundle/ShopBundle/composer.json

@@ -44,8 +44,7 @@
         "symfony/dependency-injection": "^6.4.1"
     },
     "conflict": {
-        "twig/twig": "3.9.0",
-        "twig/intl-extra": "3.9.0"
+        "twig/twig": "3.9.0"
     },
     "config": {
         "allow-plugins": {