Merge remote-tracking branch 'origin/ac1955new' into Hammer_Quality_Backlog_GraphQl_13042022

glo71317 · glo71317 · commit 1a33f5658f92 · 2022-04-21T17:49:34.000+05:30
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -159,7 +159,7 @@ private function addEntityIdSort(SearchCriteriaInterface $searchCriteria): void
     {
         $sortOrderArray = $searchCriteria->getSortOrders();
         $sortDir = SortOrder::SORT_DESC;
-        if (count($sortOrderArray) > 0) {
+        if (is_array($sortOrderArray) && count($sortOrderArray) > 0) {
             $sortOrder = end($sortOrderArray);
             // in the case the last sort order is by position, sort IDs in descendent order
             $sortDir = $sortOrder->getField() === EavAttributeInterface::POSITION

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ private function addEntityIdSort(SearchCriteriaInterface $searchCriteria): void`
`159`	`159`	`{`
`160`	`160`	`$sortOrderArray = $searchCriteria->getSortOrders();`
`161`	`161`	`$sortDir = SortOrder::SORT_DESC;`
`162`		`- if (count($sortOrderArray) > 0) {`
	`162`	`+ if (is_array($sortOrderArray) && count($sortOrderArray) > 0) {`
`163`	`163`	`$sortOrder = end($sortOrderArray);`
`164`	`164`	`// in the case the last sort order is by position, sort IDs in descendent order`
`165`	`165`	`$sortDir = $sortOrder->getField() === EavAttributeInterface::POSITION`