From f7a61bd157a94249009d977e11be276ea8d9aedd Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Sat, 10 Mar 2018 13:10:12 +0530 Subject: [PATCH 1/4] Removed unnecessary protected member variables. Removed unnecessary protected member variables of Image class. The variable `$imageHelper`, `$product` and `$attributes` are not in use. Above three variable doesn't contain any values. Also verified it on category, product and cart page. --- app/code/Magento/Catalog/Block/Product/Image.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php index a1fcdf43f6eb0..1231274fbcef2 100644 --- a/app/code/Magento/Catalog/Block/Product/Image.php +++ b/app/code/Magento/Catalog/Block/Product/Image.php @@ -19,21 +19,6 @@ */ class Image extends \Magento\Framework\View\Element\Template { - /** - * @var \Magento\Catalog\Helper\Image - */ - protected $imageHelper; - - /** - * @var \Magento\Catalog\Model\Product - */ - protected $product; - - /** - * @var array - */ - protected $attributes = []; - /** * @param \Magento\Framework\View\Element\Template\Context $context * @param array $data From 77cc7b670ee83aaeb953d34c7eba29b9bb962704 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Sat, 10 Mar 2018 17:12:59 +0530 Subject: [PATCH 2/4] Marked unnecessary member variables as `@deprecated` Restored protected properties of Image class and marked them as `@deprecated`. --- app/code/Magento/Catalog/Block/Product/Image.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php index 1231274fbcef2..dddd10ba1973a 100644 --- a/app/code/Magento/Catalog/Block/Product/Image.php +++ b/app/code/Magento/Catalog/Block/Product/Image.php @@ -19,6 +19,19 @@ */ class Image extends \Magento\Framework\View\Element\Template { + /** + * @deprecated since version 2.2-develop + */ + protected $imageHelper; + /** + * @deprecated since version 2.2-develop + */ + protected $product; + /** + * @deprecated since version 2.2-develop + */ + protected $attributes = []; + /** * @param \Magento\Framework\View\Element\Template\Context $context * @param array $data From 600881ec5e4ce3bd2057ba6c8ba43863dac39259 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Sat, 10 Mar 2018 17:14:52 +0530 Subject: [PATCH 3/4] Added space between two properties. --- app/code/Magento/Catalog/Block/Product/Image.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php index dddd10ba1973a..126603160c4e4 100644 --- a/app/code/Magento/Catalog/Block/Product/Image.php +++ b/app/code/Magento/Catalog/Block/Product/Image.php @@ -23,10 +23,12 @@ class Image extends \Magento\Framework\View\Element\Template * @deprecated since version 2.2-develop */ protected $imageHelper; + /** * @deprecated since version 2.2-develop */ protected $product; + /** * @deprecated since version 2.2-develop */ From 861cc2a3f1133ac1aa0b24b7c3d7c1d1b61165a5 Mon Sep 17 00:00:00 2001 From: Matthias Zeis Date: Sun, 11 Mar 2018 18:47:04 +0100 Subject: [PATCH 4/4] Add explanation for deprecation --- app/code/Magento/Catalog/Block/Product/Image.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php index 126603160c4e4..3ce97bd53f8d7 100644 --- a/app/code/Magento/Catalog/Block/Product/Image.php +++ b/app/code/Magento/Catalog/Block/Product/Image.php @@ -20,20 +20,23 @@ class Image extends \Magento\Framework\View\Element\Template { /** - * @deprecated since version 2.2-develop + * @deprecated Property isn't used + * @var \Magento\Catalog\Helper\Image */ protected $imageHelper; - + /** - * @deprecated since version 2.2-develop + * @deprecated Property isn't used + * @var \Magento\Catalog\Model\Product */ protected $product; - + /** - * @deprecated since version 2.2-develop + * @deprecated Property isn't used + * @var array */ protected $attributes = []; - + /** * @param \Magento\Framework\View\Element\Template\Context $context * @param array $data