Skip to content

Commit 1d054f5

Browse files
committed
MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled
- fix static
1 parent 486643a commit 1d054f5

File tree

18 files changed

+69
-26
lines changed

18 files changed

+69
-26
lines changed

app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface BaseSelectProcessorInterface
12+
*
1213
* @api
1314
* @since 101.0.3
1415
*/
@@ -20,6 +21,8 @@ interface BaseSelectProcessorInterface
2021
const PRODUCT_TABLE_ALIAS = 'child';
2122

2223
/**
24+
* Process the select statement
25+
*
2326
* @param Select $select
2427
* @return Select
2528
* @since 101.0.3

app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public function __construct(
5656
}
5757

5858
/**
59-
* @param Select $select
60-
* @return Select
59+
* @inheritdoc
6160
*/
6261
public function process(Select $select)
6362
{

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public function __construct(
8181
}
8282

8383
/**
84+
* Get address attributes.
85+
*
8486
* @return array
8587
*/
8688
private function getAddressAttributes()
@@ -210,6 +212,7 @@ private function processShippingChildrenComponents($shippingRatesLayout)
210212

211213
/**
212214
* Appends billing address form component to payment layout
215+
*
213216
* @param array $paymentLayout
214217
* @param array $elements
215218
* @return array

app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action;
77

8+
/**
9+
* Url builder class used to compose dynamic urls.
10+
*/
811
class UrlBuilder
912
{
1013
/**

app/code/Magento/Robots/Block/Data.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
/**
1717
* Robots Block Class.
18+
*
1819
* Prepares base content for robots.txt and implements Page Cache functionality.
1920
*
2021
* @api

app/code/Magento/Robots/Model/Config/Value.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
/**
2020
* Backend model for design/search_engine_robots/custom_instructions configuration value.
21+
*
2122
* Required to implement Page Cache functionality.
2223
*
2324
* @api

app/code/Magento/Sitemap/Model/Config/Backend/Robots.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
/**
2121
* Backend model for sitemap/search_engines/submission_robots configuration value.
22+
*
2223
* Required to implement Page Cache functionality.
2324
*/
2425
class Robots extends Value implements IdentityInterface

app/code/Magento/Store/App/Action/Plugin/Context.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function beforeDispatch(
104104
/**
105105
* Take action in case of invalid store requested.
106106
*
107-
* @param \Throwable|null $previousException
107+
* @param \Throwable|null $previousException
108108
* @return void
109109
* @throws NotFoundException
110110
*/

app/code/Magento/Store/App/Request/PathInfoProcessor.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public function __construct(
3636

3737
/**
3838
* Process path info and remove store from pathInfo.
39+
*
3940
* This method also sets request to no route if store is not valid and store is present in url config is enabled
4041
*
4142
* @param \Magento\Framework\App\RequestInterface $request

app/code/Magento/Store/App/Response/Redirect.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\Store\App\Response;
99

10+
/**
11+
* Class Redirect computes redirect urls responses.
12+
*/
1013
class Redirect implements \Magento\Framework\App\Response\RedirectInterface
1114
{
1215
/**
@@ -74,6 +77,8 @@ public function __construct(
7477
}
7578

7679
/**
80+
* Get the referrer url.
81+
*
7782
* @return string
7883
* @throws \Magento\Framework\Exception\NoSuchEntityException
7984
*/
@@ -162,10 +167,7 @@ public function success($defaultUrl)
162167
}
163168

164169
/**
165-
* {@inheritdoc}
166-
*
167-
* @param array $arguments
168-
* @return array
170+
* @inheritdoc
169171
*/
170172
public function updatePathParams(array $arguments)
171173
{

0 commit comments

Comments
 (0)