Merge remote-tracking branch 'origin/MAGETWO-90840' into 2.1-develop-pr55

zakdma · zakdma · commit 6000fd63b0be · 2018-06-20T18:17:40.000+03:00
diff --git a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
@@ -363,7 +363,7 @@ private function _validate(CustomerAddressModel $customerAddressModel)
      * @param \Magento\Customer\Model\Address $customerAddressModel
      * @return array
      */
-    private function getWebsiteAllowedCountries(\Magento\Customer\Model\Address $customerAddressModel): array
+    private function getWebsiteAllowedCountries(\Magento\Customer\Model\Address $customerAddressModel)
     {
         $websiteId = null;
 

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ private function _validate(CustomerAddressModel $customerAddressModel)`
`363`	`363`	`* @param \Magento\Customer\Model\Address $customerAddressModel`
`364`	`364`	`* @return array`
`365`	`365`	`*/`
`366`		`- private function getWebsiteAllowedCountries(\Magento\Customer\Model\Address $customerAddressModel): array`
	`366`	`+ private function getWebsiteAllowedCountries(\Magento\Customer\Model\Address $customerAddressModel)`
`367`	`367`	`{`
`368`	`368`	`$websiteId = null;`
`369`	`369`