From 4a2938fd9e8fa4e3c84109f8f82c3c47ee17b61f Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 13:38:41 +0000 Subject: [PATCH 1/2] Remove forbidden @author tag --- .../Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php | 1 - .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php | 1 - .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php | 2 -- .../Magento/Downloadable/Block/Catalog/Product/View/Type.php | 2 -- .../Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php | 2 -- app/code/Magento/Downloadable/Block/Checkout/Success.php | 2 -- .../Downloadable/Controller/Adminhtml/Downloadable/File.php | 2 -- app/code/Magento/Downloadable/Controller/Download.php | 2 -- .../Downloadable/Helper/Catalog/Product/Configuration.php | 2 -- app/code/Magento/Downloadable/Helper/Data.php | 2 -- app/code/Magento/Downloadable/Model/Product/Price.php | 2 -- .../Downloadable/Model/ResourceModel/Link/Collection.php | 2 -- .../Magento/Downloadable/Model/ResourceModel/Link/Purchased.php | 2 -- .../Downloadable/Model/ResourceModel/Link/Purchased/Item.php | 2 -- .../Model/System/Config/Source/Contentdisposition.php | 2 -- .../Downloadable/Model/System/Config/Source/Orderitemstatus.php | 2 -- 16 files changed, 30 deletions(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index 707e9788141c4..a59bf1d77a608 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -14,7 +14,6 @@ /** * Adminhtml catalog product downloadable items tab and form * - * @author Magento Core Team * @deprecated 100.3.1 * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite */ diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index 6b13e92553e89..da37fcaaa1361 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -8,7 +8,6 @@ /** * Adminhtml catalog product downloadable items tab links section * - * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * * @deprecated 100.3.1 in favor of new class which adds grid links diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index 04210d54f38aa..4da32ce97303d 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -8,8 +8,6 @@ /** * Adminhtml catalog product downloadable items tab links section * - * @author Magento Core Team - * * @deprecated 100.3.1 because of new class which adds grids samples * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples */ diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php index 75e8d7cdb9fab..9810003c924fc 100644 --- a/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php +++ b/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php @@ -6,8 +6,6 @@ /** * Catalog downloadable product part block - * - * @author Magento Core Team */ namespace Magento\Downloadable\Block\Catalog\Product\View; diff --git a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php index 8b8a9b6bf2895..3b28e08c58f17 100644 --- a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php @@ -6,8 +6,6 @@ /** * Shopping cart downloadable item render block - * - * @author Magento Core Team */ namespace Magento\Downloadable\Block\Checkout\Cart\Item; diff --git a/app/code/Magento/Downloadable/Block/Checkout/Success.php b/app/code/Magento/Downloadable/Block/Checkout/Success.php index d789ad0bdfae9..2087b9167d9d9 100644 --- a/app/code/Magento/Downloadable/Block/Checkout/Success.php +++ b/app/code/Magento/Downloadable/Block/Checkout/Success.php @@ -6,8 +6,6 @@ /** * Downloadable checkout success page - * - * @author Magento Core Team */ namespace Magento\Downloadable\Block\Checkout; diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php index 4480005b8e683..9236badc31afd 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php @@ -7,8 +7,6 @@ /** * Downloadable File upload controller - * - * @author Magento Core Team */ abstract class File extends \Magento\Backend\App\Action { diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php index 583b5a33c6b9c..50b12fb272c80 100644 --- a/app/code/Magento/Downloadable/Controller/Download.php +++ b/app/code/Magento/Downloadable/Controller/Download.php @@ -10,8 +10,6 @@ /** * Download controller - * - * @author Magento Core Team */ abstract class Download extends \Magento\Framework\App\Action\Action { diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php index f7e812d101edb..9504510f3d0f4 100644 --- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php +++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php @@ -8,8 +8,6 @@ /** * Helper for fetching properties by product configurational item - * - * @author Magento Core Team */ class Configuration extends \Magento\Framework\App\Helper\AbstractHelper implements \Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php index e9b2a5ce44c01..b73876ba1221b 100644 --- a/app/code/Magento/Downloadable/Helper/Data.php +++ b/app/code/Magento/Downloadable/Helper/Data.php @@ -11,8 +11,6 @@ /** * Downloadable helper - * - * @author Magento Core Team */ class Data extends \Magento\Framework\App\Helper\AbstractHelper { diff --git a/app/code/Magento/Downloadable/Model/Product/Price.php b/app/code/Magento/Downloadable/Model/Product/Price.php index d0a9a58ba205a..76c86d9b38888 100644 --- a/app/code/Magento/Downloadable/Model/Product/Price.php +++ b/app/code/Magento/Downloadable/Model/Product/Price.php @@ -6,8 +6,6 @@ /** * Downloadable products price model - * - * @author Magento Core Team */ namespace Magento\Downloadable\Model\Product; diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php index 73ae696a85187..9d44177a62acd 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php @@ -9,8 +9,6 @@ /** * Downloadable links resource collection - * - * @author Magento Core Team */ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection { diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php index 87dfd332bfa8d..5254bab0057d9 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php @@ -7,8 +7,6 @@ /** * Downloadable Product link purchased resource model - * - * @author Magento Core Team */ class Purchased extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php index cef73ac33c539..bd58311a78e8b 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php @@ -7,8 +7,6 @@ /** * Downloadable Product link purchased items resource model - * - * @author Magento Core Team */ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php index 10354f6df10ab..a603591e6b1d0 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -7,8 +7,6 @@ /** * Downloadable Content Disposition Source - * - * @author Magento Core Team */ class Contentdisposition implements \Magento\Framework\Option\ArrayInterface { diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php index 176c4337d0ce9..c74aa379c72af 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -7,8 +7,6 @@ /** * Downloadable Order Item Status Source - * - * @author Magento Core Team */ class Orderitemstatus implements \Magento\Framework\Option\ArrayInterface { From 4c3bb9dc111926b92ed0aea9b6111d22b23fd35b Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 14 Mar 2023 21:01:39 +0000 Subject: [PATCH 2/2] Fix static test failures --- .../Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php | 2 -- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php | 4 ---- .../Catalog/Product/Edit/Tab/Downloadable/Samples.php | 4 ---- .../Downloadable/Controller/Adminhtml/Downloadable/File.php | 2 +- .../Model/System/Config/Source/Contentdisposition.php | 2 ++ .../Model/System/Config/Source/Orderitemstatus.php | 2 ++ 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index a59bf1d77a608..b1628bb9d4786 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -44,8 +44,6 @@ class Downloadable extends Widget implements TabInterface protected $blockId = 'downloadableInfo'; /** - * Core registry - * * @var Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index da37fcaaa1361..6a5c7b9132a9c 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -35,8 +35,6 @@ class Links extends \Magento\Backend\Block\Template protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml'; /** - * Downloadable file - * * @var \Magento\Downloadable\Helper\File */ protected $_downloadableFile = null; @@ -49,8 +47,6 @@ class Links extends \Magento\Backend\Block\Template protected $_coreFileStorageDb = null; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry; diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index 4da32ce97303d..cc2df05e42073 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -26,8 +26,6 @@ class Samples extends \Magento\Backend\Block\Widget protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml'; /** - * Downloadable file - * * @var \Magento\Downloadable\Helper\File */ protected $_downloadableFile = null; @@ -40,8 +38,6 @@ class Samples extends \Magento\Backend\Block\Widget protected $_coreFileStorageDb = null; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry; diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php index 9236badc31afd..82ebc32e451aa 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php @@ -15,5 +15,5 @@ abstract class File extends \Magento\Backend\App\Action * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; } diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php index a603591e6b1d0..37f56d89837a3 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -11,6 +11,8 @@ class Contentdisposition implements \Magento\Framework\Option\ArrayInterface { /** + * Return option array + * * @return array */ public function toOptionArray() diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php index c74aa379c72af..535f49c556c3f 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -11,6 +11,8 @@ class Orderitemstatus implements \Magento\Framework\Option\ArrayInterface { /** + * Return option array + * * @return array */ public function toOptionArray()