Merge branch '2.4-develop' into GL_PR_Arrows_July_03_2024

magento-devops-queue-mgr-svc · web-flow · commit ef5588e56d11 · 2024-07-13T07:02:09.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
@@ -1877,8 +1877,10 @@ public function toArray(array $arrAttributes = [])
     {
         $data = parent::toArray($arrAttributes);
         $stock = $this->getStockItem();
-        if ($stock) {
+        if (is_object($stock) && method_exists($stock, 'toArray')) {
             $data['stock_item'] = $stock->toArray();
+        } elseif (is_array($stock)) {
+            $data['stock_item'] = $stock;
         }
         unset($data['stock_item']['product']);
         return $data;

Original file line number	Diff line number	Diff line change
`@@ -1877,8 +1877,10 @@ public function toArray(array $arrAttributes = [])`
`1877`	`1877`	`{`
`1878`	`1878`	`$data = parent::toArray($arrAttributes);`
`1879`	`1879`	`$stock = $this->getStockItem();`
`1880`		`- if ($stock) {`
	`1880`	`+ if (is_object($stock) && method_exists($stock, 'toArray')) {`
`1881`	`1881`	`$data['stock_item'] = $stock->toArray();`
	`1882`	`+ } elseif (is_array($stock)) {`
	`1883`	`+ $data['stock_item'] = $stock;`
`1882`	`1884`	`}`
`1883`	`1885`	`unset($data['stock_item']['product']);`
`1884`	`1886`	`return $data;`