Skip to content

Commit 3ef65e4

Browse files
committed
Merge remote-tracking branch 'git-36978/no-author/review' into bluetooth_delivery
2 parents 3dfb849 + 2829610 commit 3ef65e4

File tree

31 files changed

+45
-74
lines changed

31 files changed

+45
-74
lines changed

app/code/Magento/Review/Block/Adminhtml/Add.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
/**
1010
* Adminhtml add Review main block
11-
*
12-
* @author Magento Core Team <core@magentocommerce.com>
1311
*/
1412
class Add extends \Magento\Backend\Block\Widget\Form\Container
1513
{

app/code/Magento/Review/Block/Adminhtml/Add/Form.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@
1010

1111
/**
1212
* Adminhtml add product review form
13-
*
14-
* @author Magento Core Team <core@magentocommerce.com>
1513
*/
1614
class Form extends \Magento\Backend\Block\Widget\Form\Generic
1715
{
1816
/**
19-
* Review data
20-
*
2117
* @var \Magento\Review\Helper\Data
2218
*/
2319
protected $_reviewData = null;

app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Adminhtml review grid filter by type
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
1412
{

app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Adminhtml review grid item renderer for item type
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1412
{

app/code/Magento/Review/Block/Adminhtml/Product/Grid.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* Adminhtml product grid block
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1211
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1312
*/
1413
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid

app/code/Magento/Review/Block/Adminhtml/Rating.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
* Ratings grid
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Rating extends \Magento\Backend\Block\Widget\Grid\Container
1615
{
1716
/**
17+
* Initialise the block
18+
*
1819
* @return void
1920
*/
2021
protected function _construct()

app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Form.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
/**
99
* Rating edit form block
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Form extends \Magento\Backend\Block\Widget\Form\Generic
1412
{
1513
/**
14+
* Prepare the form
15+
*
1616
* @return $this
1717
*/
1818
protected function _prepareForm()

app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tabs.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
/**
99
* Admin rating left menu
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Tabs extends \Magento\Backend\Block\Widget\Tabs
1412
{
1513
/**
14+
* Initialise the block
15+
*
1616
* @return void
1717
*/
1818
protected function _construct()
@@ -24,6 +24,8 @@ protected function _construct()
2424
}
2525

2626
/**
27+
* Add rating information tab
28+
*
2729
* @return $this
2830
*/
2931
protected function _beforeToHtml()

app/code/Magento/Review/Block/Customer/View.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* Customer Review detailed view block
1515
*
1616
* @api
17-
* @author Magento Core Team <core@magentocommerce.com>
1817
* @since 100.0.2
1918
*/
2019
class View extends \Magento\Catalog\Block\Product\AbstractProduct
@@ -162,6 +161,7 @@ public function getRating()
162161
* Get rating summary
163162
*
164163
* @deprecated 100.3.3
164+
* @see f72f74d3
165165
* @return array
166166
*/
167167
public function getRatingSummary()
@@ -183,11 +183,14 @@ public function getTotalReviews()
183183
{
184184
if (!$this->getTotalReviewsCache()) {
185185
$this->setTotalReviewsCache(
186-
$this->_reviewFactory->create()->getTotalReviews($this->getProductData()->getId()),
187-
false,
188-
$this->_storeManager->getStore()->getId()
186+
$this->_reviewFactory->create()->getTotalReviews(
187+
$this->getProductData()->getId(),
188+
false,
189+
$this->_storeManager->getStore()->getId()
190+
)
189191
);
190192
}
193+
191194
return $this->getTotalReviewsCache();
192195
}
193196

app/code/Magento/Review/Block/Form.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,12 @@
1414
* Review form block
1515
*
1616
* @api
17-
* @author Magento Core Team <core@magentocommerce.com>
1817
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1918
* @since 100.0.2
2019
*/
2120
class Form extends \Magento\Framework\View\Element\Template
2221
{
2322
/**
24-
* Review data
25-
*
2623
* @var \Magento\Review\Helper\Data
2724
*/
2825
protected $_reviewData = null;
@@ -74,8 +71,6 @@ class Form extends \Magento\Framework\View\Element\Template
7471
private $serializer;
7572

7673
/**
77-
* Form constructor.
78-
*
7974
* @param \Magento\Framework\View\Element\Template\Context $context
8075
* @param \Magento\Framework\Url\EncoderInterface $urlEncoder
8176
* @param \Magento\Review\Helper\Data $reviewData
@@ -143,6 +138,8 @@ protected function _construct()
143138
}
144139

145140
/**
141+
* Return JavaScript layout object
142+
*
146143
* @return string
147144
*/
148145
public function getJsLayout()

0 commit comments

Comments
 (0)