-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Remove forbidden @author
tag from Magento_Eav
#37002
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
fredden
wants to merge
9
commits into
magento:2.4-develop
Choose a base branch
from
fredden:no-author/eav
base: 2.4-develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3ccbcff
Remove forbidden @author tag
fredden 3ff8656
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/eav
fredden e532b97
Fix static test failures
fredden 12087fe
Merge branch '2.4-develop' into no-author/eav
engcom-Lima 56da55e
Apply code-review suggestion
fredden bee4c53
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/eav
fredden 4197451
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/eav
fredden 8581df8
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/eav
fredden e07e771
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/eav
fredden File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,17 +7,12 @@ | |
|
||
/** | ||
* Eav Attribute Block with additional js scripts in template | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Js extends \Magento\Backend\Block\Template | ||
{ | ||
/** | ||
* Js template | ||
* | ||
* @var string | ||
*/ | ||
|
||
protected $_template = 'Magento_Eav::attribute/edit/js.phtml'; | ||
|
||
/** | ||
|
@@ -26,7 +21,7 @@ class Js extends \Magento\Backend\Block\Template | |
private $inputtype; | ||
|
||
/** | ||
* {@inheritdoc} | ||
* @inheritDoc | ||
*/ | ||
public function __construct( | ||
\Magento\Backend\Block\Template\Context $context, | ||
|
@@ -38,6 +33,8 @@ public function __construct( | |
} | ||
|
||
/** | ||
* Return compatible input types | ||
* | ||
* @deprecated 102.0.0 Misspelled method | ||
* @see getCompatibleInputTypes | ||
*/ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,6 @@ | |
* Attribute add/edit form options tab | ||
* | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @since 100.0.2 | ||
*/ | ||
class Labels extends \Magento\Backend\Block\Template | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,8 +10,6 @@ | |
|
||
/** | ||
* Disable form fields | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class PropertyLocker | ||
{ | ||
|
@@ -39,6 +37,8 @@ public function __construct( | |
} | ||
|
||
/** | ||
* Lock form data | ||
* | ||
* @param \Magento\Framework\Data\Form $form | ||
* @return void | ||
*/ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
|
||
/** | ||
* Validator for check input type value | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Validator extends InArray | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
* | ||
* @method \Magento\Eav\Model\Attribute\Data\AbstractData|null getDataModel() | ||
* Get data model linked to attribute or null. | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
namespace Magento\Eav\Model; | ||
|
||
|
@@ -22,21 +20,10 @@ | |
*/ | ||
class Attribute extends \Magento\Eav\Model\Entity\Attribute | ||
{ | ||
/** | ||
* Name of the module | ||
* Override it | ||
*/ | ||
//const MODULE_NAME = 'Magento_Eav'; | ||
|
||
/** | ||
* Name of the module | ||
* Override it | ||
*/ | ||
/** @var string */ | ||
protected $_eventObject = 'attribute'; | ||
|
||
/** | ||
* Active Website instance | ||
* | ||
* @var Website | ||
*/ | ||
protected $_website; | ||
|
@@ -188,7 +175,7 @@ public function getMultilineCount() | |
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
* @inheritDoc | ||
*/ | ||
public function afterDelete() | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,6 @@ | |
* | ||
* phpcs:disable Magento2.Classes.AbstractApi | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
* @since 100.0.2 | ||
*/ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Boolean Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Boolean extends \Magento\Eav\Model\Attribute\Data\Select | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Date Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Date extends \Magento\Eav\Model\Attribute\Data\AbstractData | ||
{ | ||
|
@@ -28,6 +26,7 @@ public function extractValue(RequestInterface $request) | |
|
||
/** | ||
* Validate data | ||
* | ||
* Return true or array of errors | ||
* | ||
* @param array|string $value | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Hidden text Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Hidden extends \Magento\Eav\Model\Attribute\Data\Text | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Image File Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Image extends \Magento\Eav\Model\Attribute\Data\File | ||
{ | ||
|
@@ -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']; | ||
|
@@ -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']; | ||
} | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Multiply line Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Multiline extends \Magento\Eav\Model\Attribute\Data\Text | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Multiply select Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Multiselect extends AbstractData | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Select Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Select extends \Magento\Eav\Model\Attribute\Data\AbstractData | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,8 +10,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Text Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
|
||
/** | ||
* EAV Entity Attribute Text Area Data Model | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Textarea extends \Magento\Eav\Model\Attribute\Data\Text | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,21 +8,19 @@ | |
|
||
/** | ||
* EAV Entity Attribute Data Factory | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class AttributeDataFactory | ||
{ | ||
const OUTPUT_FORMAT_JSON = 'json'; | ||
const OUTPUT_FORMAT_TEXT = 'text'; | ||
const OUTPUT_FORMAT_HTML = 'html'; | ||
const OUTPUT_FORMAT_PDF = 'pdf'; | ||
const OUTPUT_FORMAT_ONELINE = 'oneline'; | ||
const OUTPUT_FORMAT_ARRAY = 'array'; | ||
public const OUTPUT_FORMAT_JSON = 'json'; | ||
public const OUTPUT_FORMAT_TEXT = 'text'; | ||
public const OUTPUT_FORMAT_HTML = 'html'; | ||
public const OUTPUT_FORMAT_PDF = 'pdf'; | ||
public const OUTPUT_FORMAT_ONELINE = 'oneline'; | ||
public const OUTPUT_FORMAT_ARRAY = 'array'; | ||
|
||
// available only for multiply attributes | ||
|
||
// available only for multiply attributes | ||
/** @var array */ | ||
protected $_dataModels = []; | ||
|
||
/** | ||
|
@@ -50,6 +48,7 @@ public function __construct( | |
|
||
/** | ||
* Return attribute data model by attribute | ||
* | ||
* Set entity to data model (need for work) | ||
* | ||
* @param \Magento\Eav\Model\Attribute $attribute | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,6 @@ | |
* | ||
* phpcs:disable Magento2.Classes.AbstractApi | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.TooManyFields) | ||
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity) | ||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,8 +6,6 @@ | |
|
||
/** | ||
* Entity/Attribute/Model - attribute frontend abstract | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
namespace Magento\Eav\Model\Entity\Attribute\Frontend; | ||
|
||
|
@@ -22,6 +20,7 @@ | |
/** | ||
* EAV entity attribute form renderer. | ||
* | ||
* @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi | ||
* @api | ||
* @since 100.0.2 | ||
*/ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> | ||
*/ | ||
namespace Magento\Eav\Model\Entity\Attribute; | ||
|
||
|
@@ -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; | ||
|
||
/** | ||
|
@@ -253,6 +251,8 @@ public function organizeData($data) | |
} | ||
|
||
/** | ||
* Initialise a group model | ||
* | ||
* @param array $group | ||
* @return Group | ||
*/ | ||
|
@@ -383,7 +383,7 @@ protected function _getResource() | |
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
* @inheritDoc | ||
* @codeCoverageIgnoreStart | ||
*/ | ||
public function getAttributeSetId() | ||
|
@@ -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() | ||
{ | ||
|
@@ -471,7 +471,7 @@ public function setEntityTypeId($entityTypeId) | |
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
* @inheritDoc | ||
* | ||
* @return \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null|null | ||
*/ | ||
|
@@ -481,7 +481,7 @@ public function getExtensionAttributes() | |
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
* @inheritDoc | ||
* | ||
* @param \Magento\Eav\Api\Data\AttributeSetExtensionInterface|null $extensionAttributes | ||
* @return $this | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,6 @@ | |
* Entity/Attribute/Model - attribute selection source abstract | ||
* phpcs:disable Magento2.Classes.AbstractApi | ||
* @api | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.NumberOfChildren) | ||
* @since 100.0.2 | ||
*/ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> | ||
*/ | ||
class Config extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource | ||
{ | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.