Skip to content

Commit 9121811

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main/develop' into MAGETWO-32004
2 parents b8f027a + fb8412d commit 9121811

File tree

133 files changed

+2567
-549
lines changed

Some content is hidden

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

133 files changed

+2567
-549
lines changed

‎.htaccess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,4 @@
188188
## If running in cluster environment, uncomment this
189189
## http://developer.yahoo.com/performance/rules.html#etags
190190

191-
#FileETag none
191+
#FileETag none

‎app/code/Magento/Quote/Api/BillingAddressManagementInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface BillingAddressManagementInterface
10+
* @api
11+
*/
812
interface BillingAddressManagementInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/CartItemRepositoryInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface CartItemRepositoryInterface
10+
* @api
11+
*/
812
interface CartItemRepositoryInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/CartManagementInterface.php

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

88
use Magento\Quote\Api\Data\PaymentInterface;
99

10+
/**
11+
* Interface CartManagementInterface
12+
* @api
13+
*/
1014
interface CartManagementInterface
1115
{
1216
/**

‎app/code/Magento/Quote/Api/CartRepositoryInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface CartRepositoryInterface
10+
* @api
11+
*/
812
interface CartRepositoryInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/CartTotalRepositoryInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface CartTotalRepositoryInterface
10+
* @api
11+
*/
812
interface CartTotalRepositoryInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/CouponManagementInterface.php

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

1010
/**
1111
* Coupon management service interface.
12+
* @api
1213
*/
1314
interface CouponManagementInterface
1415
{

‎app/code/Magento/Quote/Api/Data/AddressInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface AddressInterface
10+
* @api
11+
*/
812
interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/CartInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface CartInterface
10+
* @api
11+
*/
812
interface CartInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/CartItemInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface CartItemInterface
10+
* @api
11+
*/
812
interface CartItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface CartSearchResultsInterface
10+
* @api
11+
*/
812
interface CartSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/CurrencyInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface CurrencyInterface
10+
* @api
11+
*/
812
interface CurrencyInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/PaymentInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface PaymentInterface
10+
* @api
11+
*/
812
interface PaymentInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/PaymentMethodInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface PaymentMethodInterface
10+
* @api
11+
*/
812
interface PaymentMethodInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/Data/ShippingMethodInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface ShippingMethodInterface
10+
* @api
11+
*/
812
interface ShippingMethodInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/Data/TotalsInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface TotalsInterface
10+
* @api
11+
*/
812
interface TotalsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/Data/TotalsItemInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api\Data;
77

8+
/**
9+
* Interface TotalsItemInterface
10+
* @api
11+
*/
812
interface TotalsItemInterface extends \Magento\Framework\Api\ExtensibleDataInterface
913
{
1014
/**#@+

‎app/code/Magento/Quote/Api/GuestBillingAddressManagementInterface.php

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

88
/**
99
* Billing address management interface for guest carts.
10+
* @api
1011
*/
1112
interface GuestBillingAddressManagementInterface
1213
{

‎app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php

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

88
/**
99
* Cart Item repository interface for guest carts.
10+
* @api
1011
*/
1112
interface GuestCartItemRepositoryInterface
1213
{

‎app/code/Magento/Quote/Api/GuestCartManagementInterface.php

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

1010
/**
1111
* Cart Management interface for guest carts.
12+
* @api
1213
*/
1314
interface GuestCartManagementInterface
1415
{

‎app/code/Magento/Quote/Api/GuestCartRepositoryInterface.php

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

88
/**
99
* Cart Repository interface for guest carts.
10+
* @api
1011
*/
1112
interface GuestCartRepositoryInterface
1213
{

‎app/code/Magento/Quote/Api/GuestCartTotalRepositoryInterface.php

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

99
/**
1010
* Cart totals repository interface for guest carts.
11+
* @api
1112
*/
1213
interface GuestCartTotalRepositoryInterface
1314
{

‎app/code/Magento/Quote/Api/GuestCouponManagementInterface.php

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

1010
/**
1111
* Coupon management interface for guest carts.
12+
* @api
1213
*/
1314
interface GuestCouponManagementInterface
1415
{

‎app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php

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

88
/**
99
* Payment method management interface for guest carts.
10+
* @api
1011
*/
1112
interface GuestPaymentMethodManagementInterface
1213
{

‎app/code/Magento/Quote/Api/GuestShippingAddressManagementInterface.php

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

88
/**
99
* Shipping address management interface for guest carts.
10+
* @api
1011
*/
1112
interface GuestShippingAddressManagementInterface
1213
{

‎app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php

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

88
/**
99
* Shipping method management interface for guest carts.
10+
* @api
1011
*/
1112
interface GuestShippingMethodManagementInterface
1213
{

‎app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface PaymentMethodManagementInterface
10+
* @api
11+
*/
812
interface PaymentMethodManagementInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/ShippingAddressManagementInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface ShippingAddressManagementInterface
10+
* @api
11+
*/
812
interface ShippingAddressManagementInterface
913
{
1014
/**

‎app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
*/
66
namespace Magento\Quote\Api;
77

8+
/**
9+
* Interface ShippingMethodManagementInterface
10+
* @api
11+
*/
812
interface ShippingMethodManagementInterface
913
{
1014
/**

‎app/code/Magento/Quote/Setup/InstallSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
147147
'customer_id',
148148
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
149149
null,
150-
['unsigned' => true, 'default' => '0'],
150+
['unsigned' => true],
151151
'Customer Id'
152152
)->addColumn(
153153
'customer_tax_class_id',
154154
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
155155
null,
156-
['unsigned' => true, 'default' => '0'],
156+
['unsigned' => true],
157157
'Customer Tax Class Id'
158158
)->addColumn(
159159
'customer_group_id',

‎app/code/Magento/Reports/Model/Resource/Helper.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,10 @@ public function mergeVisitorProductIndex($mainTable, $data, $matchFields)
3737
}
3838

3939
/**
40-
* Update rating position
41-
*
42-
* @param string $type day|month|year
43-
* @param string $column
44-
* @param string $mainTable
45-
* @param string $aggregationTable
46-
* @return $this
40+
* @inheritdoc
4741
*/
48-
public function updateReportRatingPos($type, $column, $mainTable, $aggregationTable)
42+
public function updateReportRatingPos($adapter, $type, $column, $mainTable, $aggregationTable)
4943
{
50-
$adapter = $this->_getWriteAdapter();
5144
$periodSubSelect = $adapter->select();
5245
$ratingSubSelect = $adapter->select();
5346
$ratingSelect = $adapter->select();

‎app/code/Magento/Reports/Model/Resource/HelperInterface.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ public function mergeVisitorProductIndex($mainTable, $data, $matchFields);
2424
/**
2525
* Update rating position
2626
*
27-
* @param string $type day|month|year
27+
* @param \Magento\Framework\DB\Adapter\AdapterInterface $adapter
28+
* @param string $type
2829
* @param string $column
2930
* @param string $mainTable
3031
* @param string $aggregationTable
31-
* @return \Magento\Framework\DB\Helper\AbstractHelper
32+
* @return $this
3233
*/
33-
public function updateReportRatingPos($type, $column, $mainTable, $aggregationTable);
34+
public function updateReportRatingPos($adapter, $type, $column, $mainTable, $aggregationTable);
3435
}

0 commit comments

Comments
 (0)