Skip to content

Commit 009e98d

Browse files
MarianaMariana
Mariana
authored and
Mariana
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into mpi-forwardport-2409
2 parents 3c02d75 + 4b0750c commit 009e98d

File tree

111 files changed

+1378
-619
lines changed

Some content is hidden

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

111 files changed

+1378
-619
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.3.0
2+
=============
3+
To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
4+
15
2.1.0
26
=============
37
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

‎app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
/**
1313
* Responsible for Select object creation, works as a builder. Returns Select as result;
14+
*
1415
* Used in SQL assemblers.
1516
*/
1617
class SelectBuilder
@@ -85,11 +86,13 @@ public function getJoins()
8586
* Set joins conditions
8687
*
8788
* @param array $joins
88-
* @return void
89+
* @return $this
8990
*/
9091
public function setJoins($joins)
9192
{
9293
$this->joins = $joins;
94+
95+
return $this;
9396
}
9497

9598
/**
@@ -106,11 +109,13 @@ public function getConnectionName()
106109
* Set connection name
107110
*
108111
* @param string $connectionName
109-
* @return void
112+
* @return $this
110113
*/
111114
public function setConnectionName($connectionName)
112115
{
113116
$this->connectionName = $connectionName;
117+
118+
return $this;
114119
}
115120

116121
/**
@@ -127,11 +132,13 @@ public function getColumns()
127132
* Set columns
128133
*
129134
* @param array $columns
130-
* @return void
135+
* @return $this
131136
*/
132137
public function setColumns($columns)
133138
{
134139
$this->columns = $columns;
140+
141+
return $this;
135142
}
136143

137144
/**
@@ -148,11 +155,13 @@ public function getFilters()
148155
* Set filters
149156
*
150157
* @param array $filters
151-
* @return void
158+
* @return $this
152159
*/
153160
public function setFilters($filters)
154161
{
155162
$this->filters = $filters;
163+
164+
return $this;
156165
}
157166

158167
/**
@@ -169,11 +178,13 @@ public function getFrom()
169178
* Set from condition
170179
*
171180
* @param array $from
172-
* @return void
181+
* @return $this
173182
*/
174183
public function setFrom($from)
175184
{
176185
$this->from = $from;
186+
187+
return $this;
177188
}
178189

179190
/**
@@ -236,11 +247,13 @@ public function getGroup()
236247
* Set group
237248
*
238249
* @param array $group
239-
* @return void
250+
* @return $this
240251
*/
241252
public function setGroup($group)
242253
{
243254
$this->group = $group;
255+
256+
return $this;
244257
}
245258

246259
/**
@@ -257,11 +270,13 @@ public function getParams()
257270
* Set parameters
258271
*
259272
* @param array $params
260-
* @return void
273+
* @return $this
261274
*/
262275
public function setParams($params)
263276
{
264277
$this->params = $params;
278+
279+
return $this;
265280
}
266281

267282
/**
@@ -278,10 +293,12 @@ public function getHaving()
278293
* Set having condition
279294
*
280295
* @param array $having
281-
* @return void
296+
* @return $this
282297
*/
283298
public function setHaving($having)
284299
{
285300
$this->having = $having;
301+
302+
return $this;
286303
}
287304
}

‎app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ public function testCreate()
6464
['link-type' => 'right', 'table' => 'attribute', 'condition' => 'neq'],
6565
];
6666
$groups = ['id', 'name'];
67-
$this->selectBuilder->setConnectionName($connectionName);
68-
$this->selectBuilder->setFrom($from);
69-
$this->selectBuilder->setColumns($columns);
70-
$this->selectBuilder->setFilters([$filter]);
71-
$this->selectBuilder->setJoins($joins);
72-
$this->selectBuilder->setGroup($groups);
67+
$this->selectBuilder->setConnectionName($connectionName)
68+
->setFrom($from)
69+
->setColumns($columns)
70+
->setFilters([$filter])
71+
->setJoins($joins)
72+
->setGroup($groups);
7373
$this->resourceConnectionMock->expects($this->once())
7474
->method('getConnection')
7575
->with($connectionName)

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Backend\Controller\Adminhtml\System\Store;
87

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
99
use Magento\Framework\Controller\ResultFactory;
1010

11-
class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
11+
/**
12+
* Delete store.
13+
*/
14+
class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
1215
{
1316
/**
17+
* @inheritDoc
1418
* @return \Magento\Backend\Model\View\Result\Redirect
1519
*/
1620
public function execute()

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Backend\Controller\Adminhtml\System\Store;
87

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
99
use Magento\Framework\Controller\ResultFactory;
1010

11-
class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
11+
/**
12+
* Delete store view.
13+
*/
14+
class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
1215
{
1316
/**
1417
* Delete store view post action

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
1010
use Magento\Framework\Controller\ResultFactory;
1111

12+
/**
13+
* Delete website.
14+
*/
1215
class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
1316
{
1417
/**
18+
* @inheritDoc
1519
* @return \Magento\Backend\Model\View\Result\Redirect
1620
*/
1721
public function execute()

‎app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
data-validate="{required:true}"
4444
value=""
4545
placeholder="<?= /* @escapeNotVerified */ __('password') ?>"
46-
autocomplete="new-password"
46+
autocomplete="off"
4747
/>
4848
</div>
4949
</div>

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-94176"/>
1919
<group value="backup"/>
20-
<group value="skip"/>
20+
<skip>
21+
<issueId value="MQE-1187"/>
22+
<issueId value="DEVOPS-3512"/>
23+
</skip>
2124
</annotations>
2225

2326
<!--Login to admin area-->

‎app/code/Magento/Bundle/etc/db_schema.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@
120120
<table name="catalog_product_bundle_price_index" resource="default" engine="innodb"
121121
comment="Catalog Product Bundle Price Index">
122122
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
123-
comment="Entity Id"/>
123+
comment="Entity ID"/>
124124
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
125125
comment="Website Id"/>
126126
<column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
127-
comment="Customer Group Id"/>
127+
comment="Customer Group ID"/>
128128
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
129129
comment="Min Price"/>
130130
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
@@ -153,11 +153,11 @@
153153
<table name="catalog_product_bundle_stock_index" resource="default" engine="innodb"
154154
comment="Catalog Product Bundle Stock Index">
155155
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
156-
comment="Entity Id"/>
156+
comment="Entity ID"/>
157157
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
158-
comment="Website Id"/>
158+
comment="Website ID"/>
159159
<column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
160-
comment="Stock Id"/>
160+
comment="Stock ID"/>
161161
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
162162
default="0" comment="Option Id"/>
163163
<column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
@@ -172,13 +172,13 @@
172172
<table name="catalog_product_index_price_bundle_idx" resource="default" engine="innodb"
173173
comment="Catalog Product Index Price Bundle Idx">
174174
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
175-
comment="Entity Id"/>
175+
comment="Entity ID"/>
176176
<column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
177177
identity="false"/>
178178
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
179-
comment="Website Id"/>
179+
comment="Website ID"/>
180180
<column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
181-
default="0" comment="Tax Class Id"/>
181+
default="0" comment="Tax Class ID"/>
182182
<column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
183183
comment="Price Type"/>
184184
<column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -206,13 +206,13 @@
206206
<table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
207207
comment="Catalog Product Index Price Bundle Tmp">
208208
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
209-
comment="Entity Id"/>
209+
comment="Entity ID"/>
210210
<column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
211211
identity="false"/>
212212
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
213-
comment="Website Id"/>
213+
comment="Website ID"/>
214214
<column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
215-
default="0" comment="Tax Class Id"/>
215+
default="0" comment="Tax Class ID"/>
216216
<column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
217217
comment="Price Type"/>
218218
<column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -240,11 +240,11 @@
240240
<table name="catalog_product_index_price_bundle_sel_idx" resource="default" engine="innodb"
241241
comment="Catalog Product Index Price Bundle Sel Idx">
242242
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
243-
comment="Entity Id"/>
243+
comment="Entity ID"/>
244244
<column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
245245
identity="false"/>
246246
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
247-
comment="Website Id"/>
247+
comment="Website ID"/>
248248
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
249249
default="0" comment="Option Id"/>
250250
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -268,11 +268,11 @@
268268
<table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
269269
comment="Catalog Product Index Price Bundle Sel Tmp">
270270
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
271-
comment="Entity Id"/>
271+
comment="Entity ID"/>
272272
<column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
273273
identity="false"/>
274274
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
275-
comment="Website Id"/>
275+
comment="Website ID"/>
276276
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
277277
default="0" comment="Option Id"/>
278278
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -296,11 +296,11 @@
296296
<table name="catalog_product_index_price_bundle_opt_idx" resource="default" engine="innodb"
297297
comment="Catalog Product Index Price Bundle Opt Idx">
298298
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
299-
comment="Entity Id"/>
299+
comment="Entity ID"/>
300300
<column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
301301
identity="false"/>
302302
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
303-
comment="Website Id"/>
303+
comment="Website ID"/>
304304
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
305305
default="0" comment="Option Id"/>
306306
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -323,11 +323,11 @@
323323
<table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
324324
comment="Catalog Product Index Price Bundle Opt Tmp">
325325
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
326-
comment="Entity Id"/>
326+
comment="Entity ID"/>
327327
<column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
328328
identity="false"/>
329329
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
330-
comment="Website Id"/>
330+
comment="Website ID"/>
331331
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
332332
default="0" comment="Option Id"/>
333333
<column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"

‎app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
*/
66
namespace Magento\Catalog\Controller\Adminhtml\Category\Image;
77

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
89
use Magento\Framework\Controller\ResultFactory;
910

1011
/**
1112
* Class Upload
1213
*/
13-
class Upload extends \Magento\Backend\App\Action
14+
class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
1415
{
1516
/**
1617
* Image uploader
@@ -54,14 +55,6 @@ public function execute()
5455

5556
try {
5657
$result = $this->imageUploader->saveFileToTmpDir($imageId);
57-
58-
$result['cookie'] = [
59-
'name' => $this->_getSession()->getName(),
60-
'value' => $this->_getSession()->getSessionId(),
61-
'lifetime' => $this->_getSession()->getCookieLifetime(),
62-
'path' => $this->_getSession()->getCookiePath(),
63-
'domain' => $this->_getSession()->getCookieDomain(),
64-
];
6558
} catch (\Exception $e) {
6659
$result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
6760
}

0 commit comments

Comments
 (0)