Skip to content

Commit 40e46db

Browse files
committed
Merge remote-tracking branch '39241/phpdoc/directory-allowed-countries' into novcommpr-2
2 parents 8cb04e3 + fd2bd49 commit 40e46db

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

app/code/Magento/Directory/Model/AllowedCountries.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2016 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Directory\Model;
@@ -18,7 +18,7 @@
1818
*/
1919
class AllowedCountries
2020
{
21-
const ALLOWED_COUNTRIES_PATH = 'general/country/allow';
21+
public const ALLOWED_COUNTRIES_PATH = 'general/country/allow';
2222

2323
/**
2424
* @var ScopeConfigInterface
@@ -47,7 +47,7 @@ public function __construct(
4747
* Retrieve all allowed countries for scope or scopes
4848
*
4949
* @param string $scope
50-
* @param string|null $scopeCode
50+
* @param string|null|array $scopeCode
5151
* @return array
5252
* @since 100.1.2
5353
*/

0 commit comments

Comments
 (0)