Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,12 @@

/**
* Eav Attribute Block with additional js scripts in template
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Js extends \Magento\Backend\Block\Template
{
/**
* Js template
*
* @var string
*/

protected $_template = 'Magento_Eav::attribute/edit/js.phtml';

/**
Expand All @@ -26,7 +21,7 @@ class Js extends \Magento\Backend\Block\Template
private $inputtype;

/**
* {@inheritdoc}
* @inheritDoc
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
Expand All @@ -38,6 +33,8 @@ public function __construct(
}

/**
* Return compatible input types
*
* @deprecated 102.0.0 Misspelled method
* @see getCompatibleInputTypes
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Attribute add/edit form options tab
*
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @since 100.0.2
*/
class Labels extends \Magento\Backend\Block\Template
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* Disable form fields
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class PropertyLocker
{
Expand Down Expand Up @@ -39,6 +37,8 @@ public function __construct(
}

/**
* Lock form data
*
* @param \Magento\Framework\Data\Form $form
* @return void
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Validator for check input type value
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Validator extends InArray
{
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*
* phpcs:disable Magento2.Classes.AbstractApi
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
*/
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/Attribute/Data/Boolean.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* EAV Entity Attribute Boolean Data Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Boolean extends \Magento\Eav\Model\Attribute\Data\Select
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/Attribute/Data/Hidden.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* EAV Entity Attribute Hidden text Data Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Hidden extends \Magento\Eav\Model\Attribute\Data\Text
{
Expand Down
5 changes: 3 additions & 2 deletions app/code/Magento/Eav/Model/Attribute/Data/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* EAV Entity Attribute Image File Data Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Image extends \Magento\Eav\Model\Attribute\Data\File
{
Expand All @@ -31,6 +29,7 @@ protected function _validateByRules($value)
$rules = $this->getAttribute()->getValidateRules();
$localStorage = !$this->_directory->getDriver() instanceof ExtendedDriverInterface;
$imageProp = $localStorage
// @phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged,Magento2.Functions.DiscouragedFunction.DiscouragedWithAlternative
? @getimagesize($value['tmp_name'])
: $this->_directory->getDriver()->getMetadata($value['tmp_name']);
$allowImageTypes = ['gif', 'jpg', 'jpeg', 'png'];
Expand All @@ -44,8 +43,10 @@ protected function _validateByRules($value)
}

// modify image name
// phpcs:ignore Magento2.Functions.DiscouragedFunction.DiscouragedWithAlternative
$extension = pathinfo($value['name'], PATHINFO_EXTENSION);
if ($extension !== $imageProp['extension']) {
// phpcs:ignore Magento2.Functions.DiscouragedFunction.DiscouragedWithAlternative
$value['name'] = pathinfo($value['name'], PATHINFO_FILENAME) . '.' . $imageProp['extension'];
}

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

/**
* EAV Entity Attribute Text Area Data Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Textarea extends \Magento\Eav\Model\Attribute\Data\Text
{
Expand Down
7 changes: 1 addition & 6 deletions app/code/Magento/Eav/Model/AttributeDataFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* EAV Entity Attribute Data Factory
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class AttributeDataFactory implements ResetAfterRequestInterface
{
Expand All @@ -22,10 +20,7 @@ class AttributeDataFactory implements ResetAfterRequestInterface
public const OUTPUT_FORMAT_ONELINE = 'oneline';
public const OUTPUT_FORMAT_ARRAY = 'array';

// available only for multiply attributes
/**
* @var array
*/
/** @var array available only for multiply attributes */
protected $_dataModels = [];

/**
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Eav/Model/Entity/AbstractEntity.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
*
* phpcs:disable Magento2.Classes.AbstractApi
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Entity/Attribute/Model - attribute frontend abstract
*
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Eav\Model\Entity\Attribute\Frontend;

Expand All @@ -22,6 +20,7 @@
/**
* EAV entity attribute form renderer.
*
* @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi
* @api
* @since 100.0.2
*/
Expand Down
26 changes: 13 additions & 13 deletions app/code/Magento/Eav/Model/Entity/Attribute/Set.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
* @method \Magento\Eav\Model\Entity\Attribute\Set setAttributeSetName(string $value)
* @method int getSortOrder()
* @method \Magento\Eav\Model\Entity\Attribute\Set setSortOrder(int $value)
*
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Eav\Model\Entity\Attribute;

Expand All @@ -31,13 +29,13 @@ class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
/**#@+
* Constants
*/
const KEY_ATTRIBUTE_SET_ID = 'attribute_set_id';
const KEY_ATTRIBUTE_SET_NAME = 'attribute_set_name';
const KEY_SORT_ORDER = 'sort_order';
const KEY_ENTITY_TYPE_ID = 'entity_type_id';
public const KEY_ATTRIBUTE_SET_ID = 'attribute_set_id';
public const KEY_ATTRIBUTE_SET_NAME = 'attribute_set_name';
public const KEY_SORT_ORDER = 'sort_order';
public const KEY_ENTITY_TYPE_ID = 'entity_type_id';
/**#@-*/

/**#@-*/
/** @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb */
protected $_resource;

/**
Expand Down Expand Up @@ -253,6 +251,8 @@ public function organizeData($data)
}

/**
* Initialise a group model
*
* @param array $group
* @return Group
*/
Expand Down Expand Up @@ -383,7 +383,7 @@ protected function _getResource()
}

/**
* {@inheritdoc}
* @inheritDoc
* @codeCoverageIgnoreStart
*/
public function getAttributeSetId()
Expand All @@ -392,23 +392,23 @@ public function getAttributeSetId()
}

/**
* {@inheritdoc}
* @inheritDoc
*/
public function getAttributeSetName()
{
return $this->getData(self::KEY_ATTRIBUTE_SET_NAME);
}

/**
* {@inheritdoc}
* @inheritDoc
*/
public function getSortOrder()
{
return $this->getData(self::KEY_SORT_ORDER);
}

/**
* {@inheritdoc}
* @inheritDoc
*/
public function getEntityTypeId()
{
Expand Down Expand Up @@ -471,7 +471,7 @@ public function setEntityTypeId($entityTypeId)
}

/**
* {@inheritdoc}
* @inheritDoc
*
* @return \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null|null
*/
Expand All @@ -481,7 +481,7 @@ public function getExtensionAttributes()
}

/**
* {@inheritdoc}
* @inheritDoc
*
* @param \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null $extensionAttributes
* @return $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* Entity/Attribute/Model - attribute selection source abstract
* phpcs:disable Magento2.Classes.AbstractApi
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.NumberOfChildren)
* @since 100.0.2
*/
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/Entity/Attribute/Source/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
* Entity/Attribute/Model - attribute selection source from configuration
*
* this class should be abstract, but kept usual for legacy purposes
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Config extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/Form/Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
* @method \Magento\Eav\Model\Form\Type setTheme(string $value)
* @method int getStoreId()
* @method \Magento\Eav\Model\Form\Type setStoreId(int $value)
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Type extends \Magento\Framework\Model\AbstractModel
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/ResourceModel/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Eav Resource Config model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Config extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* Eav Resource Attribute Set Collection
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Collection extends \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

/**
* Entity attribute option resource model
*
*/
class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@

/**
* Entity attribute option collection
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Option value table
*
* @var string
*/
protected $_optionValueTable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Eav Resource Attribute Set Collection
*
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @since 100.0.2
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* Eav Entity store resource model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Store extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Eav Resource Entity Type Collection Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/ResourceModel/Form/Attribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* EAV Form Attribute Resource Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Eav\Model\ResourceModel\Form;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* EAV Form Attribute Resource Collection
*
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @since 100.0.2
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/ResourceModel/Form/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Eav Form Element Resource Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Element extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
* Eav Form Fieldset Resource Model
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Fieldset extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
Loading