From d96adfa9130b83a96c7d5b981c35db45a8273a54 Mon Sep 17 00:00:00 2001
From: Guilliam Xavier <guilliamxavier@users.noreply.github.com>
Date: Wed, 31 Mar 2021 15:08:59 +0200
Subject: [PATCH 1/4] Revert using defaults.order as collection.order

---
 .../Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
index 0d57428d3a9..cf47b7e8f9d 100644
--- a/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
+++ b/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
@@ -183,7 +183,7 @@ private function registerCommonConfiguration(ContainerBuilder $container, array
         $container->setParameter('api_platform.eager_loading.fetch_partial', $config['eager_loading']['fetch_partial']);
         $container->setParameter('api_platform.eager_loading.force_eager', $config['eager_loading']['force_eager']);
         $container->setParameter('api_platform.collection.exists_parameter_name', $config['collection']['exists_parameter_name']);
-        $container->setParameter('api_platform.collection.order', $config['defaults']['order'] ?? $config['collection']['order']);
+        $container->setParameter('api_platform.collection.order', $config['collection']['order']);
         $container->setParameter('api_platform.collection.order_parameter_name', $config['collection']['order_parameter_name']);
         $container->setParameter('api_platform.collection.pagination.enabled', $config['defaults']['pagination_enabled'] ?? $this->isConfigEnabled($container, $config['collection']['pagination']));
         $container->setParameter('api_platform.collection.pagination.partial', $config['defaults']['pagination_partial'] ?? $config['collection']['pagination']['partial']);

From bd15cfd1cc9abcb278534f2d84ba309459669708 Mon Sep 17 00:00:00 2001
From: Guilliam Xavier <guilliamxavier@users.noreply.github.com>
Date: Wed, 31 Mar 2021 15:16:29 +0200
Subject: [PATCH 2/4] Revert test config order-related change

---
 tests/Fixtures/app/config/config_common.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Fixtures/app/config/config_common.yml b/tests/Fixtures/app/config/config_common.yml
index 3e75a29823f..35930cb5a12 100644
--- a/tests/Fixtures/app/config/config_common.yml
+++ b/tests/Fixtures/app/config/config_common.yml
@@ -67,7 +67,6 @@ api_platform:
         pagination_client_items_per_page:     true
         pagination_client_partial:            true
         pagination_items_per_page:            3
-        order:                                'ASC'
         cache_headers:
             max_age:                          60
             shared_max_age:                   3600

From 99cfd42bc0a0d619d5d11c747c143864819e900e Mon Sep 17 00:00:00 2001
From: Guilliam Xavier <guilliamxavier@users.noreply.github.com>
Date: Wed, 31 Mar 2021 15:18:38 +0200
Subject: [PATCH 3/4] Revert other order-related change

---
 src/Bridge/Doctrine/Orm/Extension/OrderExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php b/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php
index a149d752740..b9486857dea 100644
--- a/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php
+++ b/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php
@@ -56,7 +56,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
             if (empty($defaultOrder)) {
                 $defaultOrder = $this->resourceMetadataFactory->create($resourceClass)->getAttribute('order');
             }
-            if (\is_array($defaultOrder)) {
+            if (null !== $defaultOrder) {
                 foreach ($defaultOrder as $field => $order) {
                     if (\is_int($field)) {
                         // Default direction

From ae86cc47395ca66579b689091ee2c0654ac9de3c Mon Sep 17 00:00:00 2001
From: Guilliam Xavier <guilliamxavier@users.noreply.github.com>
Date: Wed, 31 Mar 2021 15:18:39 +0200
Subject: [PATCH 4/4] Revert other order-related change

---
 src/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php b/src/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php
index a46e3a2e085..561597a4599 100644
--- a/src/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php
+++ b/src/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php
@@ -58,7 +58,7 @@ public function applyToCollection(Builder $aggregationBuilder, string $resourceC
             if (empty($defaultOrder)) {
                 $defaultOrder = $this->resourceMetadataFactory->create($resourceClass)->getAttribute('order');
             }
-            if (\is_array($defaultOrder)) {
+            if (null !== $defaultOrder) {
                 foreach ($defaultOrder as $field => $order) {
                     if (\is_int($field)) {
                         // Default direction