Skip to content

Commit 4ab9c9e

Browse files
Indrani SonawaneIndrani Sonawane
Indrani Sonawane
authored and
Indrani Sonawane
committed
Merge remote-tracking branch '37000/no-author/customer-02' into compr248beta1
2 parents 820f76e + 62ac8b7 commit 4ab9c9e

File tree

32 files changed

+31
-80
lines changed

32 files changed

+31
-80
lines changed

Diff for: app/code/Magento/Customer/Model/Attribute/Data/Multiline.php

-2
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 <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

Diff for: app/code/Magento/Customer/Model/Attribute/Data/Multiselect.php

-2
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 <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

Diff for: app/code/Magento/Customer/Model/Attribute/Data/Select.php

-2
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 <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

Diff for: app/code/Magento/Customer/Model/Attribute/Data/Text.php

-2
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 <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

Diff for: app/code/Magento/Customer/Model/Attribute/Data/Textarea.php

-2
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 <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\Attribute\Data;
1311

Diff for: app/code/Magento/Customer/Model/Config/Backend/Password/Link/Expirationperiod.php

-2
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 <[email protected]>
1210
*/
1311
class Expirationperiod extends \Magento\Framework\App\Config\Value
1412
{

Diff for: app/code/Magento/Customer/Model/Config/Backend/Show/Address.php

-2
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 <[email protected]>
1412
*/
1513
class Address extends Customer
1614
{

Diff for: app/code/Magento/Customer/Model/Config/Backend/Show/AddressOnly.php

-2
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 <[email protected]>
1412
*/
1513
class AddressOnly extends Customer
1614
{

Diff for: app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
/**
1616
* Customer Show Customer Model
1717
*
18-
* @author Magento Core Team <[email protected]>
1918
* @SuppressWarnings(PHPMD.UnusedPrivateField)
2019
*/
2120
class Customer extends \Magento\Framework\App\Config\Value

Diff for: app/code/Magento/Customer/Model/Config/Share.php

+3-8
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 <[email protected]>
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

Diff for: app/code/Magento/Customer/Model/Config/Source/Address/Type.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Source model of customer address types
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\Config\Source\Address;
1311

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Backend/Billing.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
/**
99
* Customer default billing address backend
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Billing extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{
1513
/**
14+
* Before save
15+
*
1616
* @param \Magento\Framework\DataObject $object
1717
* @return void
1818
*/
@@ -25,6 +25,8 @@ public function beforeSave($object)
2525
}
2626

2727
/**
28+
* After save
29+
*
2830
* @param \Magento\Framework\DataObject $object
2931
* @return void
3032
*/

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Backend/Shipping.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
/**
99
* Customer default shipping address backend
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Shipping extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{
1513
/**
14+
* Before save
15+
*
1616
* @param \Magento\Framework\DataObject $object
1717
* @return void
1818
*/
@@ -25,6 +25,8 @@ public function beforeSave($object)
2525
}
2626

2727
/**
28+
* After save
29+
*
2830
* @param \Magento\Framework\DataObject $object
2931
* @return void
3032
*/

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Store attribute backend
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Website attribute backend
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Website extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
/**
1111
* Customer group attribute source
12-
*
13-
* @author Magento Core Team <[email protected]>
1412
*/
1513
class Group extends \Magento\Eav\Model\Entity\Attribute\Source\Table implements GroupSourceLoggedInOnlyInterface
1614
{

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Customer store attribute source
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Store extends \Magento\Eav\Model\Entity\Attribute\Source\Table
1412
{
@@ -58,6 +56,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
5856
}
5957

6058
/**
59+
* Return option text
60+
*
6161
* @param string $value
6262
* @return array|string
6363
*/
@@ -95,6 +95,8 @@ public function getOptionText($value)
9595
}
9696

9797
/**
98+
* Return new stores collection
99+
*
98100
* @return \Magento\Store\Model\ResourceModel\Store\Collection
99101
*/
100102
protected function _createStoresCollection()

Diff for: app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Customer website attribute source
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Website extends \Magento\Eav\Model\Entity\Attribute\Source\Table
1412
{
@@ -44,6 +42,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
4442
}
4543

4644
/**
45+
* Return option text
46+
*
4747
* @param int|string $value
4848
* @return string|false
4949
*/

Diff for: app/code/Magento/Customer/Model/Form.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
namespace Magento\Customer\Model;
8+
79
/**
810
* Customer Form Model
9-
*
10-
* @author Magento Core Team <[email protected]>
1111
*/
12-
namespace Magento\Customer\Model;
13-
1412
class Form extends \Magento\Eav\Model\Form
1513
{
1614
/**
1715
* XML configuration paths for "Disable autocomplete on storefront" property
1816
*/
19-
const XML_PATH_ENABLE_AUTOCOMPLETE = 'customer/password/autocomplete_on_storefront';
17+
public const XML_PATH_ENABLE_AUTOCOMPLETE = 'customer/password/autocomplete_on_storefront';
2018

2119
/**
2220
* Current module pathname
@@ -33,8 +31,7 @@ class Form extends \Magento\Eav\Model\Form
3331
protected $_entityTypeCode = 'customer';
3432

3533
/**
36-
* Get EAV Entity Form Attribute Collection for Customer
37-
* exclude 'created_at'
34+
* Get EAV Entity Form Attribute Collection for Customer exclude 'created_at'
3835
*
3936
* @return \Magento\Customer\Model\ResourceModel\Form\Attribute\Collection
4037
*/

Diff for: app/code/Magento/Customer/Model/Renderer/Region.php

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
/**
1111
* Region field renderer
12-
*
13-
* @author Magento Core Team <[email protected]>
1412
*/
1513
class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
1614
{

Diff for: app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Backend/Region.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Address region attribute backend
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Region extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{
@@ -45,6 +43,8 @@ public function beforeSave($object)
4543
}
4644

4745
/**
46+
* Return new region object
47+
*
4848
* @return \Magento\Directory\Model\Region
4949
*/
5050
protected function _createRegionInstance()

Diff for: app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Collection.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer Address EAV additional attribute resource collection
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\ResourceModel\Address\Attribute;
1311

Diff for: app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php

+5-7
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Customer country attribute source
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;
138

149
use Magento\Framework\App\ObjectManager;
1510
use Magento\Store\Model\StoreManagerInterface;
1611

1712
/**
18-
* Class Country.
19-
* @package Magento\Customer\Model\ResourceModel\Address\Attribute\Source
13+
* Customer country attribute source
2014
*/
2115
class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
2216
{
@@ -58,6 +52,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
5852
}
5953

6054
/**
55+
* Return new countries object
56+
*
6157
* @return \Magento\Directory\Model\ResourceModel\Country\Collection
6258
*/
6359
protected function _createCountriesCollection()
@@ -67,7 +63,9 @@ protected function _createCountriesCollection()
6763

6864
/**
6965
* Retrieve Store Manager
66+
*
7067
* @deprecated 101.0.0
68+
* @see nothing
7169
* @return StoreManagerInterface
7270
*/
7371
private function getStoreManager()

Diff for: app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer country with website specified attribute source
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;
1311

Diff for: app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer region attribute source
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;
1311

@@ -44,6 +42,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
4442
}
4543

4644
/**
45+
* Return new regions object
46+
*
4747
* @return \Magento\Directory\Model\ResourceModel\Region\Collection
4848
*/
4949
protected function _createRegionsCollection()

Diff for: app/code/Magento/Customer/Model/ResourceModel/Address/Collection.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Customers collection
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\AbstractCollection

Diff for: app/code/Magento/Customer/Model/ResourceModel/Attribute.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Customer attribute resource model
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Customer\Model\ResourceModel;
1311

0 commit comments

Comments
 (0)