Skip to content

Commit bc1c7ba

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #8543 from magento-gl/bluetooth_delivery
[Bluetooth] Pull Requests delivery
2 parents a77984d + d0d9cc5 commit bc1c7ba

File tree

205 files changed

+290
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+290
-551
lines changed

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Categories tree with checkboxes
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Checkboxes;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Category form image field helper
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
1311

@@ -39,6 +37,8 @@ public function __construct(
3937
}
4038

4139
/**
40+
* Return the URL
41+
*
4242
* @return bool|string
4343
*/
4444
protected function _getUrl()

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml additional helper block for sort by
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml additional helper block for sort by
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml additional helper block for sort by
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Product in category grid
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
1311

@@ -127,6 +125,7 @@ protected function _prepareCollection()
127125
if ($this->getCategory()->getId()) {
128126
$this->setDefaultFilter(['in_category' => 1]);
129127
}
128+
130129
$collection = $this->_productFactory->create()->getCollection()->addAttributeToSelect(
131130
'name'
132131
)->addAttributeToSelect(
@@ -150,13 +149,15 @@ protected function _prepareCollection()
150149
if ($storeId > 0) {
151150
$collection->addStoreFilter($storeId);
152151
}
152+
153153
$this->setCollection($collection);
154154

155155
if ($this->getCategory()->getProductsReadonly()) {
156156
$productIds = $this->_getSelectedProducts();
157157
if (empty($productIds)) {
158158
$productIds = 0;
159159
}
160+
160161
$this->getCollection()->addFieldToFilter('entity_id', ['in' => $productIds]);
161162
}
162163

@@ -183,6 +184,7 @@ protected function _prepareColumns()
183184
]
184185
);
185186
}
187+
186188
$this->addColumn(
187189
'entity_id',
188190
[
@@ -264,6 +266,7 @@ protected function _getSelectedProducts()
264266
$products = $this->getCategory()->getProductsPosition();
265267
return array_keys($products);
266268
}
269+
267270
return $products;
268271
}
269272
}

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Category chooser for Wysiwyg CMS widget
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Widget;
1311

@@ -27,6 +25,8 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
2725
protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
2826

2927
/**
28+
* Initialise the block
29+
*
3030
* @return void
3131
*/
3232
protected function _construct()

‎app/code/Magento/Catalog/Block/Adminhtml/Form.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Base block for rendering category and product forms
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml;
138

149
use Magento\Backend\Block\Widget\Form\Generic;
1510

11+
/**
12+
* Base block for rendering category and product forms
13+
*/
1614
class Form extends Generic
1715
{
1816
/**
17+
* Prepare the layout
18+
*
1919
* @return void
2020
*/
2121
protected function _prepareLayout()

‎app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Catalog Custom Options Config Renderer
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
138

149
use Magento\Config\Block\System\Config\Form\Field;
1510
use Magento\Framework\Data\Form\Element\AbstractElement;
1611

12+
/**
13+
* Catalog Custom Options Config Renderer
14+
*/
1715
class DateFieldsOrder extends Field
1816
{
1917
/**
18+
* Return the HTML for this element
19+
*
2020
* @param AbstractElement $element
2121
* @return string
2222
* @SuppressWarnings(PHPMD.NPathComplexity)

‎app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Catalog Custom Options Config Renderer
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
138

149
use Magento\Config\Block\System\Config\Form\Field;
1510
use Magento\Framework\Data\Form\Element\AbstractElement;
1611

12+
/**
13+
* Catalog Custom Options Config Renderer
14+
*/
1715
class YearRange extends Field
1816
{
1917
/**
18+
* Return the HTML for this element
19+
*
2020
* @param AbstractElement $element
2121
* @return string
2222
*/

‎app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88

99
/**
1010
* Catalog fieldset element renderer
11-
*
12-
* @author Magento Core Team <[email protected]>
1311
*/
1412
class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
1513
{
1614
/**
17-
* Initialize block template
15+
* @var string
1816
*/
1917
protected $_template = 'Magento_Catalog::catalog/form/renderer/fieldset/element.phtml';
2018

‎app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Catalog textarea attribute WYSIWYG button
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Helper\Form;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Textarea attribute WYSIWYG content
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg;
138

149
use Magento\Backend\Block\Widget\Form;
1510
use Magento\Backend\Block\Widget\Form\Generic;
1611

1712
/**
18-
* Class Content
13+
* Textarea attribute WYSIWYG content
1914
*
2015
* @deprecated 101.0.8
2116
* @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
@@ -46,7 +41,8 @@ public function __construct(
4641
}
4742

4843
/**
49-
* Prepare form.
44+
* Prepare the form
45+
*
5046
* Adding editor field to render
5147
*
5248
* @return Form

‎app/code/Magento/Catalog/Block/Adminhtml/Product.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Catalog manage products block
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
/**
99
* Adminhtml catalog product attributes block
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Attribute extends \Magento\Backend\Block\Widget\Grid\Container
1412
{
1513
/**
14+
* Initialise the block
15+
*
1616
* @return void
1717
*/
1818
protected function _construct()

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Product attribute add/edit form block
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit;
138

149
use Magento\Backend\Block\Widget\Form\Generic;
1510
use Magento\Framework\Data\Form as DataForm;
1611

12+
/**
13+
* Product attribute add/edit form block
14+
*/
1715
class Form extends Generic
1816
{
1917
/**
18+
* Prepare the form
19+
*
2020
* @return $this
2121
*/
2222
protected function _prepareForm()

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Product attribute add/edit form main tab
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
138

149
use Magento\Backend\Block\Template\Context;
@@ -21,6 +16,8 @@
2116
use Magento\Framework\Registry;
2217

2318
/**
19+
* Product attribute add/edit form main tab
20+
*
2421
* @api
2522
* @since 100.0.2
2623
*/
@@ -58,7 +55,7 @@ public function __construct(
5855
}
5956

6057
/**
61-
* {@inheritdoc}
58+
* @inheritDoc
6259
* @return $this
6360
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
6461
*/

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Product attribute add/edit form main tab
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
*
1010
* @method \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Options setReadOnly(bool $value)
1111
* @method null|bool getReadOnly()
12-
*
13-
* @author Magento Core Team <[email protected]>
1412
*/
1513
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
1614

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Product attribute add/edit form system tab
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
138

149
use Magento\Backend\Block\Widget\Form\Generic;
1510

11+
/**
12+
* Product attribute add/edit form system tab
13+
*/
1614
class System extends Generic
1715
{
1816
/**
17+
* Prepare the form
18+
*
1919
* @return $this
2020
*/
2121
protected function _prepareForm()

0 commit comments

Comments
 (0)