fix: #20002 optimize head request on serializeDataProvider

yiisoft · Oct 14, 2023 · 3014fa2 · 3014fa2
1 parent 4fe40f9
commit 3014fa2
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/framework/rest/Serializer.php b/framework/rest/Serializer.php
@@ -188,20 +188,20 @@ protected function getRequestedFields()
      */
     protected function serializeDataProvider($dataProvider)
     {
+        if (($pagination = $dataProvider->getPagination()) !== false) {
+            $this->addPaginationHeaders($pagination);
+        }
+        if ($this->request->getIsHead()) {
+            return null;
+        }
         if ($this->preserveKeys) {
             $models = $dataProvider->getModels();
         } else {
             $models = array_values($dataProvider->getModels());
         }
         $models = $this->serializeModels($models);
 
-        if (($pagination = $dataProvider->getPagination()) !== false) {
-            $this->addPaginationHeaders($pagination);
-        }
-
-        if ($this->request->getIsHead()) {
-            return null;
-        } elseif ($this->collectionEnvelope === null) {
+        if ($this->collectionEnvelope === null) {
             return $models;
         }