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..bbaf3d5280384 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 @@ -1,7 +1,7 @@ * @deprecated 100.3.1 * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite */ @@ -45,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 6b13e92553e89..d978522d562a2 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 @@ -1,14 +1,13 @@ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * * @deprecated 100.3.1 in favor of new class which adds grid links @@ -36,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; @@ -50,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 04210d54f38aa..deac894a46c78 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 @@ -1,15 +1,13 @@ - * * @deprecated 100.3.1 because of new class which adds grids samples * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples */ @@ -28,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; @@ -42,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/Block/Catalog/Product/View/Type.php b/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php index 75e8d7cdb9fab..8d8e254f23209 100644 --- a/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php +++ b/app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php @@ -1,13 +1,11 @@ */ 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..b7507498db53b 100644 --- a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php @@ -1,13 +1,11 @@ */ 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..15676be984fe3 100644 --- a/app/code/Magento/Downloadable/Block/Checkout/Success.php +++ b/app/code/Magento/Downloadable/Block/Checkout/Success.php @@ -1,13 +1,11 @@ */ 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..22f8884cc0850 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php @@ -1,14 +1,12 @@ */ abstract class File extends \Magento\Backend\App\Action { @@ -17,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/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php index 583b5a33c6b9c..87d0216f29059 100644 --- a/app/code/Magento/Downloadable/Controller/Download.php +++ b/app/code/Magento/Downloadable/Controller/Download.php @@ -1,7 +1,7 @@ */ 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..2082b79977941 100644 --- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php +++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php @@ -1,15 +1,13 @@ */ 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..a0649cf8b9052 100644 --- a/app/code/Magento/Downloadable/Helper/Data.php +++ b/app/code/Magento/Downloadable/Helper/Data.php @@ -1,7 +1,7 @@ */ 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..1b6c76e10cbd1 100644 --- a/app/code/Magento/Downloadable/Model/Product/Price.php +++ b/app/code/Magento/Downloadable/Model/Product/Price.php @@ -1,13 +1,11 @@ */ 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 bd841bbab2369..83e6e82acfa2a 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php @@ -1,7 +1,7 @@ */ 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..75c2ad5385334 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php @@ -1,14 +1,12 @@ */ 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..d3758bb0ccb50 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php @@ -1,14 +1,12 @@ */ 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..2b96db6d504e4 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -1,18 +1,18 @@ */ 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 176c4337d0ce9..617ce5603e1be 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -1,18 +1,18 @@ */ class Orderitemstatus implements \Magento\Framework\Option\ArrayInterface { /** + * Return option array + * * @return array */ public function toOptionArray()