Skip to content

Commit 99ab580

Browse files
author
Gabriel da Gama
authored
Merge branch 'api-changes-develop' into 32015-api-develop
2 parents f250cce + 2e1b1b0 commit 99ab580

File tree

773 files changed

+6741
-1493
lines changed

Some content is hidden

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

773 files changed

+6741
-1493
lines changed

‎app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<policy id="script-src">
1212
<values>
1313
<value id="adobedtm" type="host">assets.adobedtm.com</value>
14+
<value id="adobe" type="host">*.adobe.com</value>
15+
</values>
16+
</policy>
17+
<policy id="style-src">
18+
<values>
19+
<value id="adobe" type="host">*.adobe.com</value>
1420
</values>
1521
</policy>
1622
<policy id="img-src">
@@ -19,6 +25,7 @@
1925
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2026
<value id="dpmdemdex" type="host">dpm.demdex.net</value>
2127
<value id="everesttech" type="host">cm.everesttech.net</value>
28+
<value id="adobe" type="host">*.adobe.com</value>
2229
</values>
2330
</policy>
2431
<policy id="connect-src">
@@ -27,9 +34,15 @@
2734
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2835
</values>
2936
</policy>
37+
<policy id="media-src">
38+
<values>
39+
<value id="adobe" type="host">*.adobe.com</value>
40+
</values>
41+
</policy>
3042
<policy id="frame-src">
3143
<values>
3244
<value id="amcdemdex" type="host">fast.amc.demdex.net</value>
45+
<value id="adobe" type="host">*.adobe.com</value>
3346
</values>
3447
</policy>
3548
</policies>

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function execute()
3434
/** @var $export \Magento\ImportExport\Model\Export */
3535
$export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
3636
$export->setData($data);
37-
$attrFilterBlock->prepareCollection(
38-
$export->filterAttributeCollection($export->getEntityAttributeCollection())
37+
$export->filterAttributeCollection(
38+
$attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
3939
);
4040
return $resultLayout;
4141
} catch (\Exception $e) {

‎app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\AdvancedSearch\Block;
79

810
/**
911
* Interface \Magento\AdvancedSearch\Block\SearchDataInterface
1012
*
13+
* @api
1114
*/
1215
interface SearchDataInterface
1316
{

‎app/code/Magento/Analytics/Api/Data/LinkInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Analytics\Api\Data;
79

810
/**
911
* Represents link with collected data and initialized vector for decryption.
12+
*
13+
* @api
1014
*/
1115
interface LinkInterface
1216
{

‎app/code/Magento/Analytics/Api/LinkProviderInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Analytics\Api;
79

810
/**
911
* Provides link to file with collected report data.
12+
*
13+
* @api
1014
*/
1115
interface LinkProviderInterface
1216
{

‎app/code/Magento/Analytics/Model/Connector/CommandInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Analytics\Model\Connector;
79

810
/**
911
* Introduces family of integration calls.
1012
* Each implementation represents call to external service.
13+
*
14+
* @api
1115
*/
1216
interface CommandInterface
1317
{

‎app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Analytics\Model;
79

810
/**
911
* The interface represents the type of classes that handling of a new data collection for MBI.
12+
*
13+
* @api
1014
*/
1115
interface ExportDataHandlerInterface
1216
{

‎app/code/Magento/Analytics/Model/ReportWriterInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Analytics\Model;
79

810
use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -14,6 +16,8 @@
1416
* Executes export of collected data
1517
* Iterates registered providers @see etc/analytics.xml
1618
* Collects data (to TMP folder)
19+
*
20+
* @api
1721
*/
1822
interface ReportWriterInterface
1923
{

‎app/code/Magento/Analytics/ReportXml/DB/Assembler/AssemblerInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Analytics\ReportXml\DB\Assembler;
79

810
use Magento\Analytics\ReportXml\DB\SelectBuilder;
@@ -13,6 +15,8 @@
1315
* Introduces family of SQL assemblers
1416
* Each assembler populates SelectBuilder with config information
1517
* @see usage examples at \Magento\Analytics\ReportXml\QueryFactory
18+
*
19+
* @api
1620
*/
1721
interface AssemblerInterface
1822
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Responsible for Select object creation, works as a builder. Returns Select as result;
1414
*
1515
* Used in SQL assemblers.
16+
*
17+
* @api
1618
*/
1719
class SelectBuilder
1820
{

0 commit comments

Comments
 (0)