Merge remote-tracking branch 'git-36981/no-author/catalog-01' into bluetooth_delivery

engcom-Echo · engcom-Echo · commit fcd76978d641 · 2023-09-15T10:09:31.000+05:30
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -6,8 +6,6 @@
 
 /**
  * Categories tree with checkboxes
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Checkboxes;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
@@ -6,8 +6,6 @@
 
 /**
  * Category form image field helper
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
 
@@ -39,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Return the URL
+     *
      * @return bool|string
      */
     protected function _getUrl()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -6,8 +6,6 @@
 
 /**
  * Adminhtml additional helper block for sort by
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
@@ -6,8 +6,6 @@
 
 /**
  * Adminhtml additional helper block for sort by
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
@@ -6,8 +6,6 @@
 
 /**
  * Adminhtml additional helper block for sort by
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -6,8 +6,6 @@
 
 /**
  * Product in category grid
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
 
@@ -127,6 +125,7 @@ protected function _prepareCollection()
         if ($this->getCategory()->getId()) {
             $this->setDefaultFilter(['in_category' => 1]);
         }
+
         $collection = $this->_productFactory->create()->getCollection()->addAttributeToSelect(
             'name'
         )->addAttributeToSelect(
@@ -150,13 +149,15 @@ protected function _prepareCollection()
         if ($storeId > 0) {
             $collection->addStoreFilter($storeId);
         }
+
         $this->setCollection($collection);
 
         if ($this->getCategory()->getProductsReadonly()) {
             $productIds = $this->_getSelectedProducts();
             if (empty($productIds)) {
                 $productIds = 0;
             }
+
             $this->getCollection()->addFieldToFilter('entity_id', ['in' => $productIds]);
         }
 
@@ -183,6 +184,7 @@ protected function _prepareColumns()
                 ]
             );
         }
+
         $this->addColumn(
             'entity_id',
             [
@@ -264,6 +266,7 @@ protected function _getSelectedProducts()
             $products = $this->getCategory()->getProductsPosition();
             return array_keys($products);
         }
+
         return $products;
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -6,8 +6,6 @@
 
 /**
  * Category chooser for Wysiwyg CMS widget
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Widget;
 
@@ -27,6 +25,8 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
     protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
 
     /**
+     * Initialise the block
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Form.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Base block for rendering category and product forms
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml;
 
 use Magento\Backend\Block\Widget\Form\Generic;
 
+/**
+ * Base block for rendering category and product forms
+ */
 class Form extends Generic
 {
     /**
+     * Prepare the layout
+     *
      * @return void
      */
     protected function _prepareLayout()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog Custom Options Config Renderer
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
 
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Catalog Custom Options Config Renderer
+ */
 class DateFieldsOrder extends Field
 {
     /**
+     * Return the HTML for this element
+     *
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog Custom Options Config Renderer
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
 
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Catalog Custom Options Config Renderer
+ */
 class YearRange extends Field
 {
     /**
+     * Return the HTML for this element
+     *
      * @param AbstractElement $element
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -8,13 +8,11 @@
 
 /**
  * Catalog fieldset element renderer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
 {
     /**
-     * Initialize block template
+     * @var string
      */
     protected $_template = 'Magento_Catalog::catalog/form/renderer/fieldset/element.phtml';
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -6,8 +6,6 @@
 
 /**
  * Catalog textarea attribute WYSIWYG button
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Helper\Form;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
@@ -4,18 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Textarea attribute WYSIWYG content
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg;
 
 use Magento\Backend\Block\Widget\Form;
 use Magento\Backend\Block\Widget\Form\Generic;
 
 /**
- * Class Content
+ * Textarea attribute WYSIWYG content
  *
  * @deprecated 101.0.8
  * @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
@@ -46,7 +41,8 @@ public function __construct(
     }
 
     /**
-     * Prepare form.
+     * Prepare the form
+     *
      * Adding editor field to render
      *
      * @return Form
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Product.php
@@ -6,8 +6,6 @@
 
 /**
  * Catalog manage products block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
@@ -7,12 +7,12 @@
 
 /**
  * Adminhtml catalog product attributes block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Attribute extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
+     * Initialise the block
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit;
 
 use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Framework\Data\Form as DataForm;
 
+/**
+ * Product attribute add/edit form block
+ */
 class Form extends Generic
 {
     /**
+     * Prepare the form
+     *
      * @return $this
      */
     protected function _prepareForm()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form main tab
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Block\Template\Context;
@@ -21,6 +16,8 @@
 use Magento\Framework\Registry;
 
 /**
+ * Product attribute add/edit form main tab
+ *
  * @api
  * @since 100.0.2
  */
@@ -58,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -6,8 +6,6 @@
 
 /**
  * Product attribute add/edit form main tab
- *
- * @author Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -9,8 +9,6 @@
  *
  * @method \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Options setReadOnly(bool $value)
  * @method null|bool getReadOnly()
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form system tab
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Block\Widget\Form\Generic;
 
+/**
+ * Product attribute add/edit form system tab
+ */
 class System extends Generic
 {
     /**
+     * Prepare the form
+     *
      * @return $this
      */
     protected function _prepareForm()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Product in category grid`
`9`		`- *`
`10`		`- * @author Magento Core Team <core@magentocommerce.com>`
`11`	`9`	`*/`
`12`	`10`	`namespace Magento\Catalog\Block\Adminhtml\Category\Tab;`
`13`	`11`
`@@ -127,6 +125,7 @@ protected function _prepareCollection()`
`127`	`125`	`if ($this->getCategory()->getId()) {`
`128`	`126`	`$this->setDefaultFilter(['in_category' => 1]);`
`129`	`127`	`}`
	`128`	`+`
`130`	`129`	`$collection = $this->_productFactory->create()->getCollection()->addAttributeToSelect(`
`131`	`130`	`'name'`
`132`	`131`	`)->addAttributeToSelect(`
`@@ -150,13 +149,15 @@ protected function _prepareCollection()`
`150`	`149`	`if ($storeId > 0) {`
`151`	`150`	`$collection->addStoreFilter($storeId);`
`152`	`151`	`}`
	`152`	`+`
`153`	`153`	`$this->setCollection($collection);`
`154`	`154`
`155`	`155`	`if ($this->getCategory()->getProductsReadonly()) {`
`156`	`156`	`$productIds = $this->_getSelectedProducts();`
`157`	`157`	`if (empty($productIds)) {`
`158`	`158`	`$productIds = 0;`
`159`	`159`	`}`
	`160`	`+`
`160`	`161`	`$this->getCollection()->addFieldToFilter('entity_id', ['in' => $productIds]);`
`161`	`162`	`}`
`162`	`163`
`@@ -183,6 +184,7 @@ protected function _prepareColumns()`
`183`	`184`	`]`
`184`	`185`	`);`
`185`	`186`	`}`
	`187`	`+`
`186`	`188`	`$this->addColumn(`
`187`	`189`	`'entity_id',`
`188`	`190`	`[`
`@@ -264,6 +266,7 @@ protected function _getSelectedProducts()`
`264`	`266`	`$products = $this->getCategory()->getProductsPosition();`
`265`	`267`	`return array_keys($products);`
`266`	`268`	`}`
	`269`	`+`
`267`	`270`	`return $products;`
`268`	`271`	`}`
`269`	`272`	`}`