Skip to content

Commit

Permalink
Merge remote-tracking branch '37000/no-author/customer-02' into compr…
Browse files Browse the repository at this point in the history
…248beta1
  • Loading branch information
Indrani Sonawane authored and Indrani Sonawane committed Jul 10, 2024
2 parents 820f76e + 62ac8b7 commit 4ab9c9e
Show file tree
Hide file tree
Showing 32 changed files with 31 additions and 80 deletions.
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Multiline.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Multiply line Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Multiply select Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Select.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Select Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Text Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Textarea.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Text Area Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Customer Reset Password Link Expiration period backend model
*
* @author Magento Core Team <[email protected]>
*/
class Expirationperiod extends \Magento\Framework\App\Config\Value
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Customer Show Address Model
*
* @author Magento Core Team <[email protected]>
*/
class Address extends Customer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Customer Show Address Model
*
* @author Magento Core Team <[email protected]>
*/
class AddressOnly extends Customer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
/**
* Customer Show Customer Model
*
* @author Magento Core Team <[email protected]>
* @SuppressWarnings(PHPMD.UnusedPrivateField)
*/
class Customer extends \Magento\Framework\App\Config\Value
Expand Down
11 changes: 3 additions & 8 deletions app/code/Magento/Customer/Model/Config/Share.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,21 @@

/**
* Customer sharing config model
*
* @author Magento Core Team <[email protected]>
*/
class Share extends \Magento\Framework\App\Config\Value implements \Magento\Framework\Option\ArrayInterface
{
/**
* Xml config path to customers sharing scope value
*
*/
const XML_PATH_CUSTOMER_ACCOUNT_SHARE = 'customer/account_share/scope';
public const XML_PATH_CUSTOMER_ACCOUNT_SHARE = 'customer/account_share/scope';

/**
* Possible customer sharing scopes
*
*/
const SHARE_GLOBAL = 0;

const SHARE_WEBSITE = 1;
public const SHARE_GLOBAL = 0;
public const SHARE_WEBSITE = 1;

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

/**
* Constructor
*
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Source model of customer address types
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Config\Source\Address;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

/**
* Customer default billing address backend
*
* @author Magento Core Team <[email protected]>
*/
class Billing extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
* Before save
*
* @param \Magento\Framework\DataObject $object
* @return void
*/
Expand All @@ -25,6 +25,8 @@ public function beforeSave($object)
}

/**
* After save
*
* @param \Magento\Framework\DataObject $object
* @return void
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

/**
* Customer default shipping address backend
*
* @author Magento Core Team <[email protected]>
*/
class Shipping extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
* Before save
*
* @param \Magento\Framework\DataObject $object
* @return void
*/
Expand All @@ -25,6 +25,8 @@ public function beforeSave($object)
}

/**
* After save
*
* @param \Magento\Framework\DataObject $object
* @return void
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Store attribute backend
*
* @author Magento Core Team <[email protected]>
*/
class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Website attribute backend
*
* @author Magento Core Team <[email protected]>
*/
class Website extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Customer group attribute source
*
* @author Magento Core Team <[email protected]>
*/
class Group extends \Magento\Eav\Model\Entity\Attribute\Source\Table implements GroupSourceLoggedInOnlyInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Customer store attribute source
*
* @author Magento Core Team <[email protected]>
*/
class Store extends \Magento\Eav\Model\Entity\Attribute\Source\Table
{
Expand Down Expand Up @@ -58,6 +56,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
}

/**
* Return option text
*
* @param string $value
* @return array|string
*/
Expand Down Expand Up @@ -95,6 +95,8 @@ public function getOptionText($value)
}

/**
* Return new stores collection
*
* @return \Magento\Store\Model\ResourceModel\Store\Collection
*/
protected function _createStoresCollection()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Customer website attribute source
*
* @author Magento Core Team <[email protected]>
*/
class Website extends \Magento\Eav\Model\Entity\Attribute\Source\Table
{
Expand Down Expand Up @@ -44,6 +42,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
}

/**
* Return option text
*
* @param int|string $value
* @return string|false
*/
Expand Down
11 changes: 4 additions & 7 deletions app/code/Magento/Customer/Model/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,17 @@
* See COPYING.txt for license details.
*/

namespace Magento\Customer\Model;

/**
* Customer Form Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model;

class Form extends \Magento\Eav\Model\Form
{
/**
* XML configuration paths for "Disable autocomplete on storefront" property
*/
const XML_PATH_ENABLE_AUTOCOMPLETE = 'customer/password/autocomplete_on_storefront';
public const XML_PATH_ENABLE_AUTOCOMPLETE = 'customer/password/autocomplete_on_storefront';

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

/**
* Get EAV Entity Form Attribute Collection for Customer
* exclude 'created_at'
* Get EAV Entity Form Attribute Collection for Customer exclude 'created_at'
*
* @return \Magento\Customer\Model\ResourceModel\Form\Attribute\Collection
*/
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Renderer/Region.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Region field renderer
*
* @author Magento Core Team <[email protected]>
*/
class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Address region attribute backend
*
* @author Magento Core Team <[email protected]>
*/
class Region extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
Expand Down Expand Up @@ -45,6 +43,8 @@ public function beforeSave($object)
}

/**
* Return new region object
*
* @return \Magento\Directory\Model\Region
*/
protected function _createRegionInstance()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Address EAV additional attribute resource collection
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\ResourceModel\Address\Attribute;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@
* See COPYING.txt for license details.
*/

/**
* Customer country attribute source
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;

use Magento\Framework\App\ObjectManager;
use Magento\Store\Model\StoreManagerInterface;

/**
* Class Country.
* @package Magento\Customer\Model\ResourceModel\Address\Attribute\Source
* Customer country attribute source
*/
class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
{
Expand Down Expand Up @@ -58,6 +52,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
}

/**
* Return new countries object
*
* @return \Magento\Directory\Model\ResourceModel\Country\Collection
*/
protected function _createCountriesCollection()
Expand All @@ -67,7 +63,9 @@ protected function _createCountriesCollection()

/**
* Retrieve Store Manager
*
* @deprecated 101.0.0
* @see nothing
* @return StoreManagerInterface
*/
private function getStoreManager()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer country with website specified attribute source
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer region attribute source
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;

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

/**
* Return new regions object
*
* @return \Magento\Directory\Model\ResourceModel\Region\Collection
*/
protected function _createRegionsCollection()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Customers collection
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Collection extends \Magento\Eav\Model\Entity\Collection\VersionControl\AbstractCollection
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/ResourceModel/Attribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer attribute resource model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\ResourceModel;

Expand Down
Loading

0 comments on commit 4ab9c9e

Please sign in to comment.