Merge branch '2.4-develop' into ACPT-1493

Author: andimov

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;

app/code/Magento/Customer/Model/Attribute/Data/Multiline.php

@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Multiply line Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 

app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php

@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Multiply select Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 

app/code/Magento/Customer/Model/Attribute/Data/Select.php

@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Select Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 

app/code/Magento/Customer/Model/Attribute/Data/Text.php

@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Text Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 

app/code/Magento/Customer/Model/Attribute/Data/Textarea.php

@@ -6,8 +6,6 @@
 
 /**
  * Customer Attribute Text Area Data Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Customer\Model\Attribute\Data;
 

app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php

@@ -7,8 +7,6 @@
 
 /**
  * Customer Reset Password Link Expiration period backend model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Expirationperiod extends \Magento\Framework\App\Config\Value
 {

app/code/Magento/Customer/Model/Config/Backend/Show/Address.php

@@ -9,8 +9,6 @@
 
 /**
  * Customer Show Address Model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Address extends Customer
 {

app/code/Magento/Customer/Model/Config/Backend/Show/AddressOnly.php

@@ -9,8 +9,6 @@
 
 /**
  * Customer Show Address Model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class AddressOnly extends Customer
 {

app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php

@@ -15,7 +15,6 @@
 /**
  * Customer Show Customer Model
  *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
  */
 class Customer extends \Magento\Framework\App\Config\Value