Merge remote-tracking branch 'origin/MAGETWO-32442_DataObjectPluginFailsWhenDocblockNotFound' into MAGETWO-31999-github-829-oAuth-issue

arkadiych · arkadiych · commit 4b4d1938cf7e · 2015-01-13T13:42:13.000+02:00
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -530,7 +530,7 @@ protected function _validateCustomerData(array $data)
         $quote = $this->getQuote();
         $isCustomerNew = !$quote->getCustomerId();
         $customer = $quote->getCustomer();
-        $customerData = $this->extensibleDataObjectConverter->toFlatArray($customer);
+        $customerData = $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface');
 
         /** @var Form $customerForm */
         $customerForm = $this->_formFactory->create(
@@ -594,7 +594,7 @@ protected function _validateCustomerData(array $data)
         $this->_objectCopyService->copyFieldsetToTarget(
             'customer_account',
             'to_quote',
-            $this->extensibleDataObjectConverter->toFlatArray($customer),
+            $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'),
             $quote
         );
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php
@@ -72,7 +72,11 @@ protected function _prepareForm()
             $form->addField('id', 'hidden', ['name' => 'customer_id']);
             $customer = $this->_customerRepository->getById($customerId);
             $form->setValues(
-                $this->_extensibleDataObjectConverter->toFlatArray($customer)
+                $this->_extensibleDataObjectConverter->toFlatArray(
+                    $customer,
+                    [],
+                    '\Magento\Customer\Api\Data\CustomerInterface'
+                )
             )->addValues(
                 ['customer_id' => $customerId]
             );
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php
@@ -172,7 +172,11 @@ protected function _customizeFieldset($fieldset)
         );
         $form->getElement('website_id')->setRenderer($renderer);
 
-        $accountData = $this->_extensibleDataObjectConverter->toFlatArray($this->_getCustomerDataObject());
+        $accountData = $this->_extensibleDataObjectConverter->toFlatArray(
+            $this->_getCustomerDataObject(),
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
 
         if ($this->_getCustomerDataObject()->getId()) {
             $customerFormFields = $this->_addEditCustomerFormFields($fieldset);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
@@ -29,7 +29,11 @@ protected function _validateCustomer($response)
             $customerForm = $this->_formFactory->create(
                 'customer',
                 'adminhtml_customer',
-                $this->_extensibleDataObjectConverter->toFlatArray($customer),
+                $this->_extensibleDataObjectConverter->toFlatArray(
+                    $customer,
+                    [],
+                    '\Magento\Customer\Api\Data\CustomerInterface'
+                ),
                 true
             );
             $customerForm->setInvisibleIgnored(true);
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -683,7 +683,7 @@ protected function createPasswordHash($password)
     public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
         $customerErrors = $this->validator->validateData(
-            $this->extensibleDataObjectConverter->toFlatArray($customer),
+            $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'),
             [],
             'customer'
         );
diff --git a/app/code/Magento/Customer/Model/Address/Mapper.php b/app/code/Magento/Customer/Model/Address/Mapper.php
@@ -37,7 +37,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
      */
     public function toFlatArray($addressDataObject)
     {
-        $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject);
+        $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject, [], '\Magento\Customer\Api\Data\AddressInterface');
         //preserve street
         $street = $addressDataObject->getStreet();
         if (!empty($street) && is_array($street)) {
diff --git a/app/code/Magento/Customer/Model/Customer/Mapper.php b/app/code/Magento/Customer/Model/Customer/Mapper.php
@@ -36,7 +36,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
      */
     public function toFlatArray(CustomerInterface $customer)
     {
-        $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer);
+        $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface');
         unset($flatArray["addresses"]);
         return ConvertArray::toFlatArray($flatArray);
     }
diff --git a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
@@ -125,7 +125,9 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
     {
         $this->validate($customer);
         $customerData = $this->extensibleDataObjectConverter->toFlatArray(
-            $this->customerBuilder->populate($customer)->setAddresses([])->create()
+            $this->customerBuilder->populate($customer)->setAddresses([])->create(),
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
         );
         $customerModel = $this->customerFactory->create(['data' => $customerData]);
         $storeId = $customerModel->getStoreId();
diff --git a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
@@ -67,7 +67,7 @@ public function loadData($printQuery = false, $logQuery = false)
             $groups = $searchResults->getItems();
             foreach ($groups as $group) {
                 $groupItem = new \Magento\Framework\Object();
-                $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group));
+                $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group, '\Magento\Customer\Api\Data\GroupInterface'));
                 $this->_addItem($groupItem);
             }
             $this->_setIsLoaded();
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -161,7 +161,7 @@ public function getFormValues()
         } catch (\Exception $e) {
             /** If customer does not exist do nothing. */
         }
-        $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer) : [];
+        $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface') : [];
         foreach ($this->getQuote()->getData() as $key => $value) {
             if (strpos($key, 'customer_') === 0) {
                 $data[substr($key, 9)] = $value;
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
@@ -684,7 +684,9 @@ public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $custom
         $this->setCustomerId($customer->getId());
         $customerData = $this->objectFactory->create(
             $this->extensibleDataObjectConverter->toFlatArray(
-                $this->customerBuilder->populate($customer)->setAddresses([])->create()
+                $this->customerBuilder->populate($customer)->setAddresses([])->create(),
+                [],
+                '\Magento\Customer\Api\Data\CustomerInterface'
             )
         );
         $this->_objectCopyService->copyFieldsetToTarget('customer_account', 'to_quote', $customerData, $this);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
@@ -146,7 +146,8 @@ public function testSaveActionExistingGroup()
         $simpleDataObjectConverter = Bootstrap::getObjectManager()
             ->get('Magento\Framework\Api\SimpleDataObjectConverter');
         $customerGroupData = $simpleDataObjectConverter->toFlatArray(
-            $this->groupRepository->getById($groupId)
+            $this->groupRepository->getById($groupId),
+            'Magento\Customer\Api\Data\GroupInterface'
         );
         ksort($customerGroupData);
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
@@ -599,8 +599,16 @@ public function testCreateNonexistingCustomer()
             'aPassword',
             true
         );
-        $attributesBefore = $this->extensibleDataObjectConverter->toFlatArray($existingCustomer);
-        $attributesAfter = $this->extensibleDataObjectConverter->toFlatArray($customerAfter);
+        $attributesBefore = $this->extensibleDataObjectConverter->toFlatArray(
+            $existingCustomer,
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
+        $attributesAfter = $this->extensibleDataObjectConverter->toFlatArray(
+            $customerAfter,
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
         // ignore 'updated_at'
         unset($attributesBefore['updated_at']);
         unset($attributesAfter['updated_at']);
@@ -670,7 +678,10 @@ public function testCreateCustomerInServiceVsInModel()
         $simpleDataObjectConverter = Bootstrap::getObjectManager()
             ->get('Magento\Framework\Api\SimpleDataObjectConverter');
 
-        $dataInService = $simpleDataObjectConverter->toFlatArray($savedCustomer);
+        $dataInService = $simpleDataObjectConverter->toFlatArray(
+            $savedCustomer,
+            'Magento\Customer\Api\Data\CustomerInterface'
+        );
         $expectedDifferences = [
             'created_at',
             'updated_at',
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -120,7 +120,7 @@ public function testGetCustomerAttributeMetadata()
             'id' => 1,
             'website_id' => 1,
             'store_id' => 1,
-            'group_id' => '1',
+            'group_id' => 1,
             'firstname' => 'John',
             'lastname' => 'Smith',
             'email' => 'customer@example.com',
@@ -132,7 +132,11 @@ public function testGetCustomerAttributeMetadata()
         $customer = $this->customerRepository->getById(1);
         $this->assertNotNull($customer);
 
-        $attributes = $this->_extensibleDataObjectConverter->toFlatArray($customer);
+        $attributes = $this->_extensibleDataObjectConverter->toFlatArray(
+            $customer,
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
         $this->assertNotEmpty($attributes);
 
         foreach ($attributes as $attributeCode => $attributeValue) {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php
@@ -141,8 +141,16 @@ public function testUpdateCustomer()
         $this->assertEquals('Admin', $customerAfter->getCreatedIn());
         $passwordFromFixture = 'password';
         $this->accountManagement->authenticate($customerAfter->getEmail(), $passwordFromFixture);
-        $attributesBefore = $this->converter->toFlatArray($customerBefore);
-        $attributesAfter = $this->converter->toFlatArray($customerAfter);
+        $attributesBefore = $this->converter->toFlatArray(
+            $customerBefore,
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
+        $attributesAfter = $this->converter->toFlatArray(
+            $customerAfter,
+            [],
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
         // ignore 'updated_at'
         unset($attributesBefore['updated_at']);
         unset($attributesAfter['updated_at']);
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
@@ -58,7 +58,7 @@ public function testGetProductWeeeAttributes()
             ['metadataService' => $customerMetadataService]
         );
         $expected = $this->_extensibleDataObjectConverter->toFlatArray(
-            $customerRepository->getById(1)
+            $customerRepository->getById(1), [], '\Magento\Customer\Api\Data\CustomerInterface'
         );
         $customerBuilder->populateWithArray($expected);
         $customerDataSet = $customerBuilder->create();
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
@@ -187,6 +187,7 @@ private function _setupStoreMode($customerData, $isSingleStoreMode, $canModifyCu
                 'adminhtml_customer',
                 $this->extensibleDataObjectConverterMock->toFlatArray(
                     $customerObject,
+                    [],
                     '\Magento\Customer\Api\Data\CustomerInterface'
                 )
             )
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
@@ -32,11 +32,17 @@ public function __construct(DataObjectProcessor $dataObjectProcessor)
      *
      * @param ExtensibleDataInterface $dataObject
      * @param string[] $skipCustomAttributes
+     * @param string $dataObjectType
      * @return array
      */
-    public function toNestedArray(ExtensibleDataInterface $dataObject, $skipCustomAttributes = [])
-    {
-        $dataObjectType = get_class($dataObject);
+    public function toNestedArray(
+        ExtensibleDataInterface $dataObject,
+        $skipCustomAttributes = [],
+        $dataObjectType = null
+    ) {
+        if ($dataObjectType == null) {
+            $dataObjectType = get_class($dataObject);
+        }
         $dataObjectArray = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType);
         //process custom attributes if present
         if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
@@ -58,11 +64,15 @@ public function toNestedArray(ExtensibleDataInterface $dataObject, $skipCustomAt
      *
      * @param ExtensibleDataInterface $dataObject
      * @param string[] $skipCustomAttributes
+     * @param string $dataObjectType
      * @return array
      */
-    public function toFlatArray(ExtensibleDataInterface $dataObject, $skipCustomAttributes = [])
-    {
-        $dataObjectArray = $this->toNestedArray($dataObject, $skipCustomAttributes);
+    public function toFlatArray(
+        ExtensibleDataInterface $dataObject,
+        $skipCustomAttributes = [],
+        $dataObjectType = null
+    ) {
+        $dataObjectArray = $this->toNestedArray($dataObject, $skipCustomAttributes, $dataObjectType);
         return ConvertArray::toFlatArray($dataObjectArray);
     }
 
diff --git a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
@@ -27,11 +27,14 @@ public function __construct(DataObjectProcessor $dataObjectProcessor)
      * Convert nested array into flat array.
      *
      * @param ExtensibleDataInterface $dataObject
+     * @param string $dataObjectType
      * @return array
      */
-    public function toFlatArray(ExtensibleDataInterface $dataObject)
+    public function toFlatArray(ExtensibleDataInterface $dataObject, $dataObjectType = null)
     {
-        $dataObjectType = get_class($dataObject);
+        if ($dataObjectType === null) {
+            $dataObjectType = get_class($dataObject);
+        }
         $data = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType);
         return ConvertArray::toFlatArray($data);
     }

Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ protected function createPasswordHash($password)`
`683`	`683`	`public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer)`
`684`	`684`	`{`
`685`	`685`	`$customerErrors = $this->validator->validateData(`
`686`		`- $this->extensibleDataObjectConverter->toFlatArray($customer),`
	`686`	`+ $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'),`
`687`	`687`	`[],`
`688`	`688`	`'customer'`
`689`	`689`	`);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC`
`37`	`37`	`*/`
`38`	`38`	`public function toFlatArray($addressDataObject)`
`39`	`39`	`{`
`40`		`- $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject);`
	`40`	`+ $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject, [], '\Magento\Customer\Api\Data\AddressInterface');`
`41`	`41`	`//preserve street`
`42`	`42`	`$street = $addressDataObject->getStreet();`
`43`	`43`	`if (!empty($street) && is_array($street)) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC`
`36`	`36`	`*/`
`37`	`37`	`public function toFlatArray(CustomerInterface $customer)`
`38`	`38`	`{`
`39`		`- $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer);`
	`39`	`+ $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface');`
`40`	`40`	`unset($flatArray["addresses"]);`
`41`	`41`	`return ConvertArray::toFlatArray($flatArray);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function loadData($printQuery = false, $logQuery = false)`
`67`	`67`	`$groups = $searchResults->getItems();`
`68`	`68`	`foreach ($groups as $group) {`
`69`	`69`	`$groupItem = new \Magento\Framework\Object();`
`70`		`- $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group));`
	`70`	`+ $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group, '\Magento\Customer\Api\Data\GroupInterface'));`
`71`	`71`	`$this->_addItem($groupItem);`
`72`	`72`	`}`
`73`	`73`	`$this->_setIsLoaded();`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function getFormValues()`
`161`	`161`	`} catch (\Exception $e) {`
`162`	`162`	`/** If customer does not exist do nothing. */`
`163`	`163`	`}`
`164`		`- $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer) : [];`
	`164`	`+ $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface') : [];`
`165`	`165`	`foreach ($this->getQuote()->getData() as $key => $value) {`
`166`	`166`	`if (strpos($key, 'customer_') === 0) {`
`167`	`167`	`$data[substr($key, 9)] = $value;`