Merge remote-tracking branch 'origin/MAGETWO-28011' into MAGETWO-28011

Author: nsyvokonenko

app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php

@@ -91,9 +91,6 @@ protected function _construct()
         $this->_queueLinkTable = $this->getTable('newsletter_queue_link');
         $this->_storeTable = $this->getTable('store');
 
-        // defining mapping for fields represented in several tables
-        $this->_map['fields']['customer_lastname'] = 'customer_lastname_table.value';
-        $this->_map['fields']['customer_firstname'] = 'customer_firstname_table.value';
         $this->_map['fields']['type'] = $this->getResource()->getReadConnection()->getCheckSql(
             'main_table.customer_id = 0',
             1,
@@ -145,37 +142,16 @@ public function useOnlyUnsent()
      */
     public function showCustomerInfo()
     {
-        $adapter = $this->getConnection();
-
-        $lastNameData = $this->_customerHelperData->getAttributeMetadata(
-            \Magento\Customer\Api\CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-            'lastname'
-        );
-        $firstNameData = $this->_customerHelperData->getAttributeMetadata(
-            \Magento\Customer\Api\CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-            'firstname'
+        $this->getSelect()->joinLeft(
+            [
+                'customer' => $this->getTable('customer_entity')
+            ],
+            'main_table.customer_id',
+            [
+                'customer_lastname' => 'lastname',
+                'customer_firstname' => 'firstname'
+            ]
         );
-
-        $this->getSelect()
-            ->joinLeft(
-                ['customer_lastname_table' => $lastNameData['attribute_table']],
-                $adapter->quoteInto(
-                    'customer_lastname_table.entity_id=main_table.customer_id
-                                     AND customer_lastname_table.attribute_id = ?',
-                    (int)$lastNameData['attribute_id']
-                ),
-                ['customer_lastname' => 'value']
-            )
-            ->joinLeft(
-                ['customer_firstname_table' => $firstNameData['attribute_table']],
-                $adapter->quoteInto(
-                    'customer_firstname_table.entity_id=main_table.customer_id
-                                     AND customer_firstname_table.attribute_id = ?',
-                    (int)$firstNameData['attribute_id']
-                ),
-                ['customer_firstname' => 'value']
-            );
-
         return $this;
     }
 

app/code/Magento/Quote/Model/Observer/Frontend/Quote/Address/CollectTotals.php

@@ -73,13 +73,11 @@ public function dispatch(\Magento\Framework\Event\Observer $observer)
         $customer = $quote->getCustomer();
         $storeId = $customer->getStoreId();
 
-        if (($customer->getCustomAttribute('disable_auto_group_change')
-                && $customer->getCustomAttribute('disable_auto_group_change')->getValue())
+        if ($customer->getDisableAutoGroupChange()
             || false == $this->vatValidator->isEnabled($quoteAddress, $storeId)
         ) {
             return;
         }
-
         $customerCountryCode = $quoteAddress->getCountryId();
         $customerVatNumber = $quoteAddress->getVatId();
         $groupId = null;

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php

@@ -270,7 +270,7 @@ public function testUpdateCustomerWithImageAttribute()
         $mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
         $customerMediaPath = $mediaDirectory->getAbsolutePath(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
         $previousImagePath =
-            $previousCustomerData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][1][AttributeValue::VALUE];
+            $previousCustomerData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][0][AttributeValue::VALUE];
         $this->assertFalse(file_exists($customerMediaPath . $previousImagePath));
     }
 }

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php

@@ -80,7 +80,7 @@ public function getAttributeMetadataDataProvider()
                     AttributeMetadata::NOTE             => '',
                     AttributeMetadata::SYSTEM           => true,
                     AttributeMetadata::USER_DEFINED     => false,
-                    AttributeMetadata::BACKEND_TYPE     => 'varchar',
+                    AttributeMetadata::BACKEND_TYPE     => 'static',
                     AttributeMetadata::SORT_ORDER       => 40
                 ],
             ],
@@ -106,7 +106,7 @@ public function getAttributeMetadataDataProvider()
                     AttributeMetadata::NOTE             => '',
                     AttributeMetadata::SYSTEM           => false,
                     AttributeMetadata::USER_DEFINED     => false,
-                    AttributeMetadata::BACKEND_TYPE     => 'int',
+                    AttributeMetadata::BACKEND_TYPE     => 'static',
                     AttributeMetadata::SORT_ORDER       => 110
                 ],
             ],
@@ -187,9 +187,8 @@ public function testGetCustomAttributesMetadata()
 
         $attributeMetadata = $this->_webApiCall($serviceInfo);
 
-        //Default custom attribute code 'disable_auto_group_change'
-        $this->assertCount(1, $attributeMetadata);
-        $this->assertEquals('disable_auto_group_change', $attributeMetadata[0]['attribute_code']);
+        // There are no default custom attributes.
+        $this->assertCount(0, $attributeMetadata);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

@@ -95,7 +95,15 @@ public function tearDown()
      */
     public function testGetCustomer()
     {
-        $this->assertEquals($this->_loadCustomer(), $this->_block->getCustomer());
+        $expectedCustomer = $this->_loadCustomer();
+        $actualCustomer = $this->_block->getCustomer();
+        $this->assertEquals(count($expectedCustomer->__toArray()), count($actualCustomer->__toArray()));
+        foreach ($expectedCustomer->__toArray() as $property => $value) {
+            $expectedValue = is_numeric($value) ? intval($value) : $value;
+            $actualValue = $actualCustomer->__toArray()[$property];
+            $actualValue = is_numeric($actualValue) ? intval($actualValue) : $actualValue;
+            $this->assertEquals($expectedValue, $actualValue);
+        }
     }
 
     public function testGetCustomerEmpty()