Skip to content

Commit e96ca55

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into spartans_pr_11072024_AC-12119
2 parents e3de216 + cf65863 commit e96ca55

File tree

50 files changed

+55
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+55
-131
lines changed

‎app/code/Magento/Customer/Model/Attribute/Data/Multiline.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer Attribute Multiply line Data Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

‎app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer Attribute Multiply select Data Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

‎app/code/Magento/Customer/Model/Attribute/Data/Select.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer Attribute Select Data Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

‎app/code/Magento/Customer/Model/Attribute/Data/Text.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer Attribute Text Data Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

‎app/code/Magento/Customer/Model/Attribute/Data/Textarea.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer Attribute Text Area Data Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

‎app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Customer Reset Password Link Expiration period backend model
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Expirationperiod extends \Magento\Framework\App\Config\Value
1412
{

‎app/code/Magento/Customer/Model/Config/Backend/Show/Address.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
/**
1111
* Customer Show Address Model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class Address extends Customer
1614
{

‎app/code/Magento/Customer/Model/Config/Backend/Show/AddressOnly.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
/**
1111
* Customer Show Address Model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class AddressOnly extends Customer
1614
{

‎app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
/**
1616
* Customer Show Customer Model
1717
*
18-
* @author Magento Core Team <core@magentocommerce.com>
1918
* @SuppressWarnings(PHPMD.UnusedPrivateField)
2019
*/
2120
class Customer extends \Magento\Framework\App\Config\Value

‎app/code/Magento/Customer/Model/Config/Share.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,21 @@
77

88
/**
99
* Customer sharing config model
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Share extends \Magento\Framework\App\Config\Value implements \Magento\Framework\Option\ArrayInterface
1412
{
1513
/**
1614
* Xml config path to customers sharing scope value
1715
*
1816
*/
19-
const XML_PATH_CUSTOMER_ACCOUNT_SHARE = 'customer/account_share/scope';
17+
public const XML_PATH_CUSTOMER_ACCOUNT_SHARE = 'customer/account_share/scope';
2018

2119
/**
2220
* Possible customer sharing scopes
2321
*
2422
*/
25-
const SHARE_GLOBAL = 0;
26-
27-
const SHARE_WEBSITE = 1;
23+
public const SHARE_GLOBAL = 0;
24+
public const SHARE_WEBSITE = 1;
2825

2926
/**
3027
* @var \Magento\Customer\Model\ResourceModel\Customer
@@ -37,8 +34,6 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
3734
protected $_storeManager;
3835

3936
/**
40-
* Constructor
41-
*
4237
* @param \Magento\Framework\Model\Context $context
4338
* @param \Magento\Framework\Registry $registry
4439
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config

0 commit comments

Comments
 (0)