Skip to content

Commit 175f659

Browse files
committed
MAGETWO-98832: Multistore Allowed Countries List Problem
1 parent a0db4ff commit 175f659

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

app/code/Magento/Customer/Model/AccountManagement.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,7 @@ public function validate(CustomerInterface $customer)
10851085
$result = $this->getEavValidator()->isValid($customerModel);
10861086
if ($result === false && is_array($this->getEavValidator()->getMessages())) {
10871087
return $validationResults->setIsValid(false)->setMessages(
1088+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
10881089
call_user_func_array(
10891090
'array_merge',
10901091
$this->getEavValidator()->getMessages()

app/code/Magento/Quote/Model/Quote.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@ public function addShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
13861386
* Retrieve quote items collection
13871387
*
13881388
* @param bool $useCache
1389-
* @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
1389+
* @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
13901390
*/
13911391
public function getItemsCollection($useCache = true)
13921392
{
@@ -1441,7 +1441,7 @@ public function getAllVisibleItems()
14411441
*/
14421442
public function hasItems()
14431443
{
1444-
return sizeof($this->getAllItems()) > 0;
1444+
return count($this->getAllItems()) > 0;
14451445
}
14461446

14471447
/**
@@ -1500,7 +1500,7 @@ public function getItemById($itemId)
15001500
/**
15011501
* Delete quote item. If it does not have identifier then it will be only removed from collection
15021502
*
1503-
* @param \Magento\Quote\Model\Quote\Item $item
1503+
* @param \Magento\Quote\Model\Quote\Item $item
15041504
* @return $this
15051505
*/
15061506
public function deleteItem(\Magento\Quote\Model\Quote\Item $item)
@@ -1530,7 +1530,7 @@ public function deleteItem(\Magento\Quote\Model\Quote\Item $item)
15301530
/**
15311531
* Remove quote item by item identifier
15321532
*
1533-
* @param int $itemId
1533+
* @param int $itemId
15341534
* @return $this
15351535
*/
15361536
public function removeItem($itemId)
@@ -1581,7 +1581,7 @@ public function removeAllItems()
15811581
/**
15821582
* Adding new item to quote
15831583
*
1584-
* @param \Magento\Quote\Model\Quote\Item $item
1584+
* @param \Magento\Quote\Model\Quote\Item $item
15851585
* @return $this
15861586
* @throws \Magento\Framework\Exception\LocalizedException
15871587
*/
@@ -2375,7 +2375,7 @@ public function hasVirtualItems()
23752375
/**
23762376
* Merge quotes
23772377
*
2378-
* @param Quote $quote
2378+
* @param Quote $quote
23792379
* @return $this
23802380
*/
23812381
public function merge(Quote $quote)
@@ -2613,7 +2613,7 @@ public function setExtensionAttributes(\Magento\Quote\Api\Data\CartExtensionInte
26132613
* Check is address allowed for store
26142614
*
26152615
* @param Address $address
2616-
* @param int|null $storeId
2616+
* @param int|null $storeId
26172617
* @return bool
26182618
*/
26192619
private function isAddressAllowedForWebsite(Address $address, $storeId): bool

0 commit comments

Comments
 (0)