Skip to content

Commit 8fc99b1

Browse files
author
Milan Osztromok
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 436d046 + ae53ec1 commit 8fc99b1

File tree

3,442 files changed

+121642
-50081
lines changed

Some content is hidden

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

3,442 files changed

+121642
-50081
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
/.settings
66
atlassian*
77
/nbproject
8+
/robots.txt
9+
/pub/robots.txt
810
/sitemap
911
/sitemap.xml
12+
/pub/sitemap
13+
/pub/sitemap.xml
1014
/.idea
1115
/.gitattributes
1216
/app/config_sandbox
@@ -41,6 +45,7 @@ atlassian*
4145
!/pub/media/customer/.htaccess
4246
/pub/media/downloadable/*
4347
!/pub/media/downloadable/.htaccess
48+
/pub/media/favicon/*
4449
/pub/media/import/*
4550
!/pub/media/import/.htaccess
4651
/pub/media/theme/*

‎.travis.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,46 @@ addons:
77
- mysql-client-core-5.6
88
- mysql-client-5.6
99
- postfix
10+
firefox: "46.0"
11+
hosts:
12+
- magento2.travis
1013
language: php
1114
php:
12-
- 5.6.29
1315
- 7.0
16+
- 7.1
1417
env:
1518
global:
1619
- COMPOSER_BIN_DIR=~/bin
1720
- INTEGRATION_SETS=3
1821
- NODE_JS_VERSION=6
22+
- MAGENTO_HOST_NAME="magento2.travis"
1923
matrix:
2024
- TEST_SUITE=unit
2125
- TEST_SUITE=integration INTEGRATION_INDEX=1
2226
- TEST_SUITE=integration INTEGRATION_INDEX=2
2327
- TEST_SUITE=integration INTEGRATION_INDEX=3
2428
- TEST_SUITE=static
2529
- TEST_SUITE=js
30+
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
31+
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
32+
matrix:
33+
exclude:
34+
- php: 7.0
35+
env: TEST_SUITE=static
36+
- php: 7.0
37+
env: TEST_SUITE=js
38+
- php: 7.0
39+
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
40+
- php: 7.0
41+
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
2642
cache:
2743
apt: true
2844
directories:
2945
- $HOME/.composer/cache
3046
- $HOME/.nvm
3147
- $HOME/node_modules
3248
- $HOME/yarn.lock
33-
matrix:
34-
exclude:
35-
- php: 5.6.29
36-
env: TEST_SUITE=static
37-
- php: 5.6.29
38-
env: TEST_SUITE=js
3949
before_install: ./dev/travis/before_install.sh
4050
install: composer install --no-interaction --prefer-dist
4151
before_script: ./dev/travis/before_script.sh
42-
script:
43-
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
44-
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
45-
- if [ $TEST_SUITE == "js" ]; then grunt spec; fi
52+
script: ./dev/travis/script.sh

‎COPYING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
66
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.
77

88
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
9-
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
9+
Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎README.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,33 @@ To suggest documentation improvements, click [here][4].
2727
[3]: <https://github.com/magento/magento2/issues>
2828
[4]: <http://devdocs.magento.com>
2929

30+
<h3>Labels applied by the Magento team</h3>
31+
32+
| Label | Description |
33+
| ------------- |-------------|
34+
| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
35+
| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
36+
| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
37+
| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
38+
| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
39+
| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
40+
| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
41+
| ![acknowledged](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
42+
| ![acknowledged](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
43+
3044
<h2>Reporting security issues</h2>
3145

3246
To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:[email protected]">[email protected]</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
3347

34-
Stay up-to-date on the latest vulnerabilities and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
48+
Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
49+
50+
<h2>License</h2>
51+
52+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
53+
54+
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
55+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.
56+
57+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
58+
Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
3559

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
#ini_set('display_errors', 1);
1212

1313
/* PHP version validation */
14-
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50605 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
14+
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
1515
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
16+
echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
1717
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<p>Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
21+
<p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
2222
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2323
Magento System Requirements</a>.
2424
</div>

‎app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Block;
99

10+
/**
11+
* @api
12+
*/
1013
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

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

88
use Magento\Framework\Notification\MessageInterface;
99

10+
/**
11+
* @api
12+
*/
1013
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Block/ToolbarEntry.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/**
1212
* Toolbar entry that shows latest notifications
1313
*
14+
* @api
1415
* @author Magento Core Team <[email protected]>
1516
*/
1617
class ToolbarEntry extends \Magento\Backend\Block\Template

‎app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Block;
99

10+
/**
11+
* @api
12+
*/
1013
class Window extends \Magento\Backend\Block\Template
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* AdminNotification Inbox model
1010
*
11+
* @api
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
5+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<block class="Magento\AdminNotification\Block\Window"
1717
name="notification_window"
1818
as="notification_window"
19-
acl="Magento_AdminNotification::show_toolbar"
19+
aclResource="Magento_AdminNotification::show_toolbar"
2020
template="Magento_AdminNotification::notification/window.phtml"/>
2121
</referenceContainer>
2222
<referenceContainer name="header">

‎app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area.xml

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,35 @@
99
<argument name="data" xsi:type="array">
1010
<item name="js_config" xsi:type="array">
1111
<item name="provider" xsi:type="string">notification_area.notification_area_data_source</item>
12-
<item name="deps" xsi:type="string">notification_area.notification_area_data_source</item>
1312
</item>
14-
<item name="spinner" xsi:type="string">columns</item>
1513
</argument>
16-
<dataSource name="notification_area_data_source">
17-
<argument name="dataProvider" xsi:type="configurableObject">
18-
<argument name="class" xsi:type="string">Magento\AdminNotification\Ui\Component\DataProvider\DataProvider</argument>
19-
<argument name="name" xsi:type="string">notification_area_data_source</argument>
20-
<argument name="primaryFieldName" xsi:type="string">identity</argument>
21-
<argument name="requestFieldName" xsi:type="string">identity</argument>
22-
<argument name="data" xsi:type="array">
23-
<item name="config" xsi:type="array">
24-
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
25-
<item name="update_url" xsi:type="url" path="mui/index/render"/>
26-
<item name="storageConfig" xsi:type="array">
27-
<item name="indexField" xsi:type="string">identity</item>
28-
</item>
29-
</item>
30-
</argument>
31-
</argument>
14+
<settings>
15+
<spinner>columns</spinner>
16+
<deps>
17+
<dep>notification_area.notification_area_data_source</dep>
18+
</deps>
19+
</settings>
20+
<dataSource name="notification_area_data_source" component="Magento_Ui/js/grid/provider">
21+
<settings>
22+
<storageConfig>
23+
<param name="indexField" xsi:type="string">identity</param>
24+
</storageConfig>
25+
<updateUrl path="mui/index/render"/>
26+
</settings>
27+
<dataProvider class="Magento\AdminNotification\Ui\Component\DataProvider\DataProvider" name="notification_area_data_source">
28+
<settings>
29+
<requestFieldName>identity</requestFieldName>
30+
<primaryFieldName>identity</primaryFieldName>
31+
</settings>
32+
</dataProvider>
3233
</dataSource>
33-
<columns name="columns">
34-
<argument name="data" xsi:type="array">
35-
<item name="config" xsi:type="array">
36-
<item name="component" xsi:type="string">Magento_AdminNotification/js/grid/listing</item>
37-
<item name="template" xsi:type="string">Magento_AdminNotification/grid/listing</item>
38-
</item>
39-
</argument>
40-
<column name="created_at">
41-
<argument name="data" xsi:type="array">
42-
<item name="config" xsi:type="array">
43-
<item name="component" xsi:type="string">Magento_AdminNotification/js/grid/columns/message</item>
44-
<item name="label" xsi:type="string" translate="true"/>
45-
<item name="dataType" xsi:type="string">text</item>
46-
<item name="sorting" xsi:type="string">asc</item>
47-
<item name="sortOrder" xsi:type="number">30</item>
48-
</item>
49-
</argument>
34+
<columns name="columns" component="Magento_AdminNotification/js/grid/listing" template="Magento_AdminNotification/grid/listing">
35+
<column name="created_at" component="Magento_AdminNotification/js/grid/columns/message" sortOrder="30">
36+
<settings>
37+
<dataType>text</dataType>
38+
<label translate="true"/>
39+
<sorting>asc</sorting>
40+
</settings>
5041
</column>
5142
</columns>
5243
</listing>

‎app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
5+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-catalog": "101.1.*",
77
"magento/module-catalog-inventory": "100.2.*",
88
"magento/module-eav": "100.2.*",

‎app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Activate.php

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,24 @@
66

77
namespace Magento\Analytics\Controller\Adminhtml\Subscription;
88

9+
use Magento\Analytics\Model\Config\Backend\Enabled;
910
use Magento\Analytics\Model\NotificationTime;
10-
use Magento\Analytics\Model\Subscription;
1111
use Magento\Backend\App\Action;
1212
use Magento\Backend\App\Action\Context;
13+
use Magento\Config\Model\Config\Source\Enabledisable;
14+
use Magento\Config\Model\PreparedValueFactory;
15+
use Magento\Framework\App\Config\ScopeConfigInterface;
1316
use Magento\Framework\Controller\Result\Json;
1417
use Magento\Framework\Controller\ResultFactory;
1518
use Magento\Framework\Exception\LocalizedException;
19+
use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
1620
use Psr\Log\LoggerInterface;
1721

1822
/**
1923
* Activates subscription to Magento BI Advanced Reporting.
2024
*/
2125
class Activate extends Action
2226
{
23-
/**
24-
* Resource for managing subscription to Magento BI.
25-
*
26-
* @var Subscription
27-
*/
28-
private $subscription;
29-
3027
/**
3128
* @var LoggerInterface
3229
*/
@@ -46,23 +43,36 @@ class Activate extends Action
4643
*/
4744
private $subscriptionApprovedField = 'analytics_subscription_checkbox';
4845

46+
/**
47+
* @var AbstractDb
48+
*/
49+
private $configValueResource;
50+
51+
/**
52+
* @var PreparedValueFactory
53+
*/
54+
private $preparedValueFactory;
55+
4956
/**
5057
* Activate constructor.
5158
*
5259
* @param Context $context
53-
* @param Subscription $subscription
5460
* @param LoggerInterface $logger
5561
* @param NotificationTime $notificationTime
62+
* @param AbstractDb $configValueResource
63+
* @param PreparedValueFactory $preparedValueFactory
5664
*/
5765
public function __construct(
5866
Context $context,
59-
Subscription $subscription,
6067
LoggerInterface $logger,
61-
NotificationTime $notificationTime
68+
NotificationTime $notificationTime,
69+
AbstractDb $configValueResource,
70+
PreparedValueFactory $preparedValueFactory
6271
) {
63-
$this->subscription = $subscription;
6472
$this->logger = $logger;
6573
$this->notificationTime = $notificationTime;
74+
$this->configValueResource = $configValueResource;
75+
$this->preparedValueFactory = $preparedValueFactory;
6676
parent::__construct($context);
6777
}
6878

@@ -85,7 +95,14 @@ public function execute()
8595
{
8696
try {
8797
if ($this->getRequest()->getParam($this->subscriptionApprovedField)) {
88-
$this->subscription->enable();
98+
$configValue = $this->preparedValueFactory->create(
99+
Enabled::XML_ENABLED_CONFIG_STRUCTURE_PATH,
100+
Enabledisable::ENABLE_VALUE,
101+
ScopeConfigInterface::SCOPE_TYPE_DEFAULT
102+
);
103+
104+
$this->configValueResource
105+
->save($configValue);
89106
} else {
90107
$this->notificationTime->unsetLastTimeNotificationValue();
91108
}

0 commit comments

Comments
 (0)