Merge branch 'MAGETWO-61907' into 2.1.8-develop-pr8

zakdma · zakdma · commit e01c8789c9c7 · 2017-05-15T17:18:25.000+03:00
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -323,7 +323,7 @@ protected function addFilterGroupToCollection(
      * @return void
      * @throws \Magento\Framework\Exception\InputException
      */
-    private function updateAddresses(\Magento\Framework\Api\CustomAttributesDataInterface $customer, int $customerId)
+    private function updateAddresses(\Magento\Framework\Api\CustomAttributesDataInterface $customer, $customerId)
     {
         if ($customer->getAddresses() !== null) {
             if ($customer->getId()) {

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ protected function addFilterGroupToCollection(`
`323`	`323`	`* @return void`
`324`	`324`	`* @throws \Magento\Framework\Exception\InputException`
`325`	`325`	`*/`
`326`		`- private function updateAddresses(\Magento\Framework\Api\CustomAttributesDataInterface $customer, int $customerId)`
	`326`	`+ private function updateAddresses(\Magento\Framework\Api\CustomAttributesDataInterface $customer, $customerId)`
`327`	`327`	`{`
`328`	`328`	`if ($customer->getAddresses() !== null) {`
`329`	`329`	`if ($customer->getId()) {`