From c2e8bc65ae7809844a493e18130508a30e14631b Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 11:19:06 +0000 Subject: [PATCH 1/5] Remove forbidden @author tag --- app/code/Magento/Config/Block/System/Config/Edit.php | 2 -- .../System/Config/Form/Field/FieldArray/AbstractFieldArray.php | 1 - app/code/Magento/Config/Block/System/Config/Form/Field/File.php | 2 -- .../Magento/Config/Block/System/Config/Form/Field/Heading.php | 2 -- .../Block/System/Config/Form/Field/Select/Allowspecific.php | 2 -- app/code/Magento/Config/Block/System/Config/Tabs.php | 2 -- .../Magento/Config/Controller/Adminhtml/System/Config/Save.php | 1 - app/code/Magento/Config/Model/Config.php | 1 - app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php | 2 -- .../Magento/Config/Model/Config/Backend/Admin/Custompath.php | 2 -- .../Config/Backend/Admin/Password/Link/Expirationperiod.php | 2 -- .../Config/Model/Config/Backend/Currency/AbstractCurrency.php | 2 -- app/code/Magento/Config/Model/Config/Backend/Datashare.php | 2 -- app/code/Magento/Config/Model/Config/Backend/Email/Logo.php | 2 -- app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php | 2 -- app/code/Magento/Config/Model/Config/Source/Email/Method.php | 2 -- app/code/Magento/Config/Model/Config/Source/Reports/Scope.php | 2 -- app/code/Magento/Config/Model/ResourceModel/Config.php | 1 - app/code/Magento/Config/Model/ResourceModel/Config/Data.php | 1 - .../Config/Model/ResourceModel/Config/Data/Collection.php | 1 - .../Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php | 2 -- .../Model/ResourceModel/Indexer/Stock/Configurable.php | 2 -- app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php | 2 -- app/code/Magento/Cron/Model/Config/Backend/Sitemap.php | 2 -- .../Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php | 2 -- .../Block/Adminhtml/System/Currency/Rate/Matrix.php | 2 -- .../Block/Adminhtml/System/Currency/Rate/Services.php | 2 -- .../CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php | 2 -- .../CurrencySymbol/Controller/Adminhtml/System/Currency.php | 2 -- .../Controller/Adminhtml/System/Currencysymbol.php | 2 -- 30 files changed, 54 deletions(-) diff --git a/app/code/Magento/Config/Block/System/Config/Edit.php b/app/code/Magento/Config/Block/System/Config/Edit.php index 7955f28f59f4e..416fd390eff14 100644 --- a/app/code/Magento/Config/Block/System/Config/Edit.php +++ b/app/code/Magento/Config/Block/System/Config/Edit.php @@ -6,8 +6,6 @@ /** * Config edit page - * - * @author Magento Core Team */ namespace Magento\Config\Block\System\Config; diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php index cc6b7e4b441dc..95774dd3cfe17 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php @@ -9,7 +9,6 @@ /** * Backend system config array field renderer * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/File.php b/app/code/Magento/Config/Block/System/Config/Form/Field/File.php index 6ebd85af7a5da..04ab7f3e47e40 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/File.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/File.php @@ -6,8 +6,6 @@ /** * File config field renderer - * - * @author Magento Core Team */ namespace Magento\Config\Block\System\Config\Form\Field; diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php index e9a0562f9a95c..557a969e0c49b 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Heading.php @@ -6,8 +6,6 @@ /** * Renderer for sub-heading in fieldset - * - * @author Magento Core Team */ namespace Magento\Config\Block\System\Config\Form\Field; diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php index e28f74860741e..c1bf3eca5293f 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php @@ -6,8 +6,6 @@ /** * System configuration shipping methods allow all countries select - * - * @author Magento Core Team */ namespace Magento\Config\Block\System\Config\Form\Field\Select; diff --git a/app/code/Magento/Config/Block/System/Config/Tabs.php b/app/code/Magento/Config/Block/System/Config/Tabs.php index 42e9b1940fb5f..7e71282e35d0e 100644 --- a/app/code/Magento/Config/Block/System/Config/Tabs.php +++ b/app/code/Magento/Config/Block/System/Config/Tabs.php @@ -8,8 +8,6 @@ * System configuration tabs block * * @method setTitle(string $title) - * - * @author Magento Core Team */ namespace Magento\Config\Block\System\Config; diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php index c0820bc36c846..2bf2ead8f2a51 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php @@ -13,7 +13,6 @@ /** * System Configuration Save Controller * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Save extends AbstractConfig implements HttpPostActionInterface diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php index f5188d7a419b8..3d3407b13ff5b 100644 --- a/app/code/Magento/Config/Model/Config.php +++ b/app/code/Magento/Config/Model/Config.php @@ -19,7 +19,6 @@ * * Used to save configuration * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @api * @since 100.0.2 diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php index 86eb8f1a9ba6d..b067913403602 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php +++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php @@ -6,8 +6,6 @@ /** * Config backend model for "Custom Admin URL" option - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend\Admin; diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php index a335efc95d207..e593520cfc30b 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php +++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Custompath.php @@ -6,8 +6,6 @@ /** * Config backend model for "Custom Admin Path" option - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend\Admin; diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php index 615cb9de62d4b..d6913e44d2106 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php +++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Password/Link/Expirationperiod.php @@ -6,8 +6,6 @@ /** * Admin Reset Password Link Expiration period backend model - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend\Admin\Password\Link; diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php index 25303093ace5d..e733c2120181f 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php +++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php @@ -8,8 +8,6 @@ * \Directory currency abstract backend model * * Allows dispatching before and after events for each controller action - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend\Currency; diff --git a/app/code/Magento/Config/Model/Config/Backend/Datashare.php b/app/code/Magento/Config/Model/Config/Backend/Datashare.php index f571dc7a4158e..43bf1479007d8 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Datashare.php +++ b/app/code/Magento/Config/Model/Config/Backend/Datashare.php @@ -6,8 +6,6 @@ /** * Config category field backend - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend; diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php index 015bdfc7496e3..f6640532d8a87 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php +++ b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php @@ -6,8 +6,6 @@ /** * Backend model for uploading transactional emails custom logo image - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend\Email; diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php b/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php index ccebb8c76ece8..dd380fdcedd3f 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php +++ b/app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php @@ -6,8 +6,6 @@ /** * System config image field backend model for Zend PDF generator - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Backend\Image; diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Method.php b/app/code/Magento/Config/Model/Config/Source/Email/Method.php index 4ce575b64d21b..922cdcd8cb5c3 100644 --- a/app/code/Magento/Config/Model/Config/Source/Email/Method.php +++ b/app/code/Magento/Config/Model/Config/Source/Email/Method.php @@ -6,8 +6,6 @@ /** * Source for email send method - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Source\Email; diff --git a/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php b/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php index f52a1cb5d3f6b..a00bff4b9f175 100644 --- a/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php +++ b/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php @@ -6,8 +6,6 @@ /** * Config source reports event store filter - * - * @author Magento Core Team */ namespace Magento\Config\Model\Config\Source\Reports; diff --git a/app/code/Magento/Config/Model/ResourceModel/Config.php b/app/code/Magento/Config/Model/ResourceModel/Config.php index 594a9df719daa..028492bbe0283 100644 --- a/app/code/Magento/Config/Model/ResourceModel/Config.php +++ b/app/code/Magento/Config/Model/ResourceModel/Config.php @@ -10,7 +10,6 @@ /** * Core Resource Resource Model * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Config/Model/ResourceModel/Config/Data.php b/app/code/Magento/Config/Model/ResourceModel/Config/Data.php index c15966e01c0e8..24c745a0a7fd2 100644 --- a/app/code/Magento/Config/Model/ResourceModel/Config/Data.php +++ b/app/code/Magento/Config/Model/ResourceModel/Config/Data.php @@ -8,7 +8,6 @@ /** * Core config data resource model * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php b/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php index 4c92a380df8bb..f7e192ddd35ee 100644 --- a/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php +++ b/app/code/Magento/Config/Model/ResourceModel/Config/Data/Collection.php @@ -8,7 +8,6 @@ /** * Config data collection * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php index 2ad6d55d21755..2fe53b4138109 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php @@ -6,8 +6,6 @@ /** * Product attribute add form variations main tab - * - * @author Magento Core Team */ namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\Edit\Tab\Variations; diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php index 29c4812cc7b96..16fe161dba53d 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php @@ -9,8 +9,6 @@ /** * CatalogInventory Configurable Products Stock Status Indexer Resource Model - * - * @author Magento Core Team */ use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus; use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full; diff --git a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php index 5861e69d8b6c2..6713c5ccaf5db 100644 --- a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php +++ b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php @@ -6,8 +6,6 @@ /** * Backend Model for product alerts - * - * @author Magento Core Team */ namespace Magento\Cron\Model\Config\Backend\Product; diff --git a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php index 49556f75b37f0..906f05b1ef347 100644 --- a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php +++ b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php @@ -6,8 +6,6 @@ /** * Backend Model for Currency import options - * - * @author Magento Core Team */ namespace Magento\Cron\Model\Config\Backend; diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php index 9e7a2b69f20a5..df9b15c46c1dd 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php @@ -6,8 +6,6 @@ /** * Manage currency block - * - * @author Magento Core Team */ namespace Magento\CurrencySymbol\Block\Adminhtml\System; diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php index c0d0dd68fcc23..95d08caec339b 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php @@ -6,8 +6,6 @@ /** * Manage currency block - * - * @author Magento Core Team */ namespace Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate; diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php index 491ed93900bde..2e6cf63e277a3 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php @@ -6,8 +6,6 @@ /** * Manage currency import services block - * - * @author Magento Core Team */ namespace Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate; diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php index 431a7cf858b90..4df93dce94826 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php @@ -6,8 +6,6 @@ /** * Manage currency symbols block - * - * @author Magento Core Team */ namespace Magento\CurrencySymbol\Block\Adminhtml\System; diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php index 41f7db8ad155a..56a97a9420a66 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php @@ -6,8 +6,6 @@ /** * Currency controller - * - * @author Magento Core Team */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System; diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php index 16990e6756ac4..20f771ee2b56f 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php @@ -6,8 +6,6 @@ /** * Adminhtml Currency Symbols Controller - * - * @author Magento Core Team */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System; From 0ebec4848f56a345cfcdb06bbff86eb55214de2b Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 13:24:25 +0000 Subject: [PATCH 2/5] Fix static tests --- app/code/Magento/Config/Block/System/Config/Edit.php | 4 +++- .../Config/Form/Field/FieldArray/AbstractFieldArray.php | 4 ++++ app/code/Magento/Config/Block/System/Config/Tabs.php | 2 -- .../Config/Model/Config/Backend/Currency/AbstractCurrency.php | 1 + app/code/Magento/Config/Model/Config/Backend/Datashare.php | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Config/Block/System/Config/Edit.php b/app/code/Magento/Config/Block/System/Config/Edit.php index 416fd390eff14..a39bd4a557396 100644 --- a/app/code/Magento/Config/Block/System/Config/Edit.php +++ b/app/code/Magento/Config/Block/System/Config/Edit.php @@ -19,7 +19,7 @@ */ class Edit extends \Magento\Backend\Block\Widget { - const DEFAULT_SECTION_BLOCK = \Magento\Config\Block\System\Config\Form::class; + public const DEFAULT_SECTION_BLOCK = \Magento\Config\Block\System\Config\Form::class; /** * Form block class name @@ -118,6 +118,8 @@ public function getSaveUrl() } /** + * Return search parameters in JSON format + * * @return string * @since 101.1.0 */ diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php index 95774dd3cfe17..be684cf48b158 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php @@ -9,6 +9,8 @@ /** * Backend system config array field renderer * + * phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedFunction + * phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @since 100.0.2 */ @@ -280,6 +282,8 @@ public function getColumns() } /** + * Retrieve the label for the 'add' button + * * @return string * @since 101.0.0 */ diff --git a/app/code/Magento/Config/Block/System/Config/Tabs.php b/app/code/Magento/Config/Block/System/Config/Tabs.php index 7e71282e35d0e..23562d0523154 100644 --- a/app/code/Magento/Config/Block/System/Config/Tabs.php +++ b/app/code/Magento/Config/Block/System/Config/Tabs.php @@ -19,8 +19,6 @@ class Tabs extends \Magento\Backend\Block\Widget { /** - * Tabs - * * @var \Magento\Config\Model\Config\Structure\Element\Iterator */ protected $_tabs; diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php index e733c2120181f..6544540796dc9 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php +++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php @@ -14,6 +14,7 @@ /** * Base currency class * + * phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Config/Model/Config/Backend/Datashare.php b/app/code/Magento/Config/Model/Config/Backend/Datashare.php index 43bf1479007d8..fee9f596767c2 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Datashare.php +++ b/app/code/Magento/Config/Model/Config/Backend/Datashare.php @@ -16,6 +16,8 @@ class Datashare extends \Magento\Framework\App\Config\Value { /** + * Do nothing after save + * * @return $this */ public function afterSave() From 5ec7a2117271a17ed4e3dded3014b8b739f57e5a Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 20:48:15 +0000 Subject: [PATCH 3/5] Fix static test failures --- .../Magento/Config/Model/Config/Backend/Email/Logo.php | 6 +++++- .../Magento/Config/Model/Config/Source/Email/Method.php | 7 ++++--- .../Magento/Config/Model/ResourceModel/Config/Data.php | 1 + .../Model/ResourceModel/Indexer/Stock/Configurable.php | 2 +- .../Magento/Cron/Model/Config/Backend/Product/Alert.php | 4 ++-- .../Block/Adminhtml/System/Currencysymbol.php | 5 ----- .../Controller/Adminhtml/System/Currency.php | 5 ++--- .../Controller/Adminhtml/System/Currencysymbol.php | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php index f6640532d8a87..1616604b054e6 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php +++ b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php @@ -17,7 +17,7 @@ class Logo extends \Magento\Config\Model\Config\Backend\Image /** * The tail part of directory path for uploading */ - const UPLOAD_DIR = 'email/logo'; + public const UPLOAD_DIR = 'email/logo'; /** * Upload max file size in kilobytes @@ -47,12 +47,16 @@ protected function _addWhetherScopeInfo() } /** + * Return temporary name of file + * * @return string|null */ protected function getTmpFileName() { $tmpName = null; + // @phpcs:ignore Magento2.Security.Superglobal.SuperglobalUsageError if (isset($_FILES['groups'])) { + // @phpcs:ignore Magento2.Security.Superglobal.SuperglobalUsageError $tmpName = $_FILES['groups']['tmp_name'][$this->getGroupId()]['fields'][$this->getField()]['value']; } else { $tmpName = is_array($this->getValue()) ? $this->getValue()['tmp_name'] : null; diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Method.php b/app/code/Magento/Config/Model/Config/Source/Email/Method.php index 922cdcd8cb5c3..8f1f7bd9aaea8 100644 --- a/app/code/Magento/Config/Model/Config/Source/Email/Method.php +++ b/app/code/Magento/Config/Model/Config/Source/Email/Method.php @@ -4,18 +4,19 @@ * See COPYING.txt for license details. */ -/** - * Source for email send method - */ namespace Magento\Config\Model\Config\Source\Email; /** + * Source for email send method + * * @api * @since 100.0.2 */ class Method implements \Magento\Framework\Option\ArrayInterface { /** + * Return option array + * * @return array */ public function toOptionArray() diff --git a/app/code/Magento/Config/Model/ResourceModel/Config/Data.php b/app/code/Magento/Config/Model/ResourceModel/Config/Data.php index 24c745a0a7fd2..bd2b951931682 100644 --- a/app/code/Magento/Config/Model/ResourceModel/Config/Data.php +++ b/app/code/Magento/Config/Model/ResourceModel/Config/Data.php @@ -43,6 +43,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object) /** * Validate unique configuration data before save + * * Set id to object if exists configuration instead of throw exception * * @param \Magento\Framework\Model\AbstractModel $object diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php index 16fe161dba53d..68d1fa264bc36 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php @@ -32,7 +32,7 @@ class Configurable extends \Magento\CatalogInventory\Model\ResourceModel\Indexer * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy * @param \Magento\Eav\Model\Config $eavConfig * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig - * @param null $connectionName + * @param string $connectionName * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher */ public function __construct( diff --git a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php index 6713c5ccaf5db..85166bf81cfff 100644 --- a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php +++ b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php @@ -19,12 +19,12 @@ class Alert extends \Magento\Framework\App\Config\Value /** * Cron string path for product alerts */ - const CRON_STRING_PATH = 'crontab/default/jobs/catalog_product_alert/schedule/cron_expr'; + public const CRON_STRING_PATH = 'crontab/default/jobs/catalog_product_alert/schedule/cron_expr'; /** * Cron model path for product alerts */ - const CRON_MODEL_PATH = 'crontab/default/jobs/catalog_product_alert/run/model'; + public const CRON_MODEL_PATH = 'crontab/default/jobs/catalog_product_alert/run/model'; /** * @var \Magento\Framework\App\Config\ValueFactory diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php index 4df93dce94826..35c26b7520305 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php @@ -20,11 +20,6 @@ class Currencysymbol extends \Magento\Backend\Block\Widget\Form */ protected $_symbolSystemFactory; - /** - * @var string - */ - private $_controller; - /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolSystemFactory diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php index 56a97a9420a66..879e1b23e4fd0 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php @@ -10,6 +10,7 @@ namespace Magento\CurrencySymbol\Controller\Adminhtml\System; /** + * @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @since 100.0.2 */ @@ -20,11 +21,9 @@ abstract class Currency extends \Magento\Backend\App\Action * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_CurrencySymbol::currency_rates'; + public const ADMIN_RESOURCE = 'Magento_CurrencySymbol::currency_rates'; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php index 20f771ee2b56f..349ff6fd5ebb8 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -/** - * Adminhtml Currency Symbols Controller - */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System; /** + * Adminhtml Currency Symbols Controller + * + * @phpcs:ignore Magento2.Classes.AbstractApi.AbstractApi * @api * @since 100.0.2 */ @@ -20,5 +20,5 @@ abstract class Currencysymbol extends \Magento\Backend\App\Action * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_CurrencySymbol::symbols'; + public const ADMIN_RESOURCE = 'Magento_CurrencySymbol::symbols'; } From 7b3421310c7e79c520865e60e85675d3da14df8e Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 22:07:39 +0000 Subject: [PATCH 4/5] Fix static test failure --- .../Model/ResourceModel/Indexer/Stock/Configurable.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php index 68d1fa264bc36..b66b989f62548 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php @@ -1,7 +1,5 @@ Date: Thu, 27 Jun 2024 09:03:50 +0530 Subject: [PATCH 5/5] Fixed static test failures --- .../Config/Form/Field/FieldArray/AbstractFieldArray.php | 4 ++-- app/code/Magento/Config/Model/Config/Backend/Email/Logo.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php index be684cf48b158..a7345dbda8114 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php @@ -197,7 +197,7 @@ protected function _getCellInputElementName($columnName) public function renderCellTemplate($columnName) { if (empty($this->_columns[$columnName])) { - throw new \Exception('Wrong column name specified.'); + throw new \Exception('Wrong column name specified.'); // phpcs:ignore } $column = $this->_columns[$columnName]; $inputName = $this->_getCellInputElementName($columnName); @@ -256,7 +256,7 @@ protected function _toHtml() $this->_isPreparedToRender = true; } if (empty($this->_columns)) { - throw new \Exception('At least one column must be defined.'); + throw new \Exception('At least one column must be defined.'); // phpcs:ignore } return parent::_toHtml(); } diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php index 1616604b054e6..e19375e5b1920 100644 --- a/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php +++ b/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php @@ -11,6 +11,7 @@ /** * @deprecated 100.1.5 + * @see nothing */ class Logo extends \Magento\Config\Model\Config\Backend\Image {