Skip to content

Commit 6dbf45d

Browse files
rganinrganin
committed
Merge branch 'develop' of github.com:magento/magento2ce into api
2 parents 822fe93 + 33261e7 commit 6dbf45d

File tree

1,204 files changed

+53088
-11251
lines changed

Some content is hidden

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

1,204 files changed

+53088
-11251
lines changed

‎.gitignore

Lines changed: 4 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

‎.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.6.29
1312
- 7.0
1413
env:
1514
global:
@@ -30,12 +29,6 @@ cache:
3029
- $HOME/.nvm
3130
- $HOME/node_modules
3231
- $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
3932
before_install: ./dev/travis/before_install.sh
4033
install: composer install --no-interaction --prefer-dist
4134
before_script: ./dev/travis/before_script.sh

‎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/Analytics/view/adminhtml/ui_component/analytics_subscription_form.xml

Lines changed: 122 additions & 118 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Authorization/Model/CompositeUserContext.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
1010

1111
/**
12-
* Composite user context (implements composite pattern).
12+
* User context.
13+
*
14+
* This class is not implementing standard composite pattern and will not invoke all of its children.
15+
* Instead, it will try to find the first suitable child and return its result.
16+
*
17+
* @api
1318
*/
1419
class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
1520
{

‎app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,9 @@
88
/**
99
* Admin permissions collection
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
11+
* @deprecated
12+
* @see \Magento\Authorization\Model\ResourceModel\Rules\Collection
1213
*/
13-
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
14+
class Collection extends \Magento\Authorization\Model\ResourceModel\Rules\Collection
1415
{
15-
/**
16-
* Initialize resource
17-
*
18-
* @return void
19-
*/
20-
protected function _construct()
21-
{
22-
$this->_init(
23-
\Magento\Authorization\Model\Rules::class,
24-
\Magento\Authorization\Model\ResourceModel\Rules::class
25-
);
26-
}
2716
}

‎app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php

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

1010
/**
1111
* Admin role collection
12+
*
13+
* @api
1214
*/
1315
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1416
{

‎app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Rules collection
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
11+
* @api
1212
*/
1313
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1414
{

‎app/code/Magento/Authorization/Model/Role.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* @method \Magento\Authorization\Model\Role setUserType(string $value)
2525
* @method string getRoleName()
2626
* @method \Magento\Authorization\Model\Role setRoleName(string $value)
27+
* @api
2728
*/
2829
class Role extends \Magento\Framework\Model\AbstractModel
2930
{

‎app/code/Magento/Authorization/Model/Rules.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @method \Magento\Authorization\Model\Rules setAssertId(int $value)
2222
* @method string getPermission()
2323
* @method \Magento\Authorization\Model\Rules setPermission(string $value)
24+
* @api
2425
*/
2526
class Rules extends \Magento\Framework\Model\AbstractModel
2627
{
@@ -30,14 +31,14 @@ class Rules extends \Magento\Framework\Model\AbstractModel
3031
* @param \Magento\Framework\Model\Context $context
3132
* @param \Magento\Framework\Registry $registry
3233
* @param \Magento\Authorization\Model\ResourceModel\Rules $resource
33-
* @param \Magento\Authorization\Model\ResourceModel\Permissions\Collection $resourceCollection
34+
* @param \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection
3435
* @param array $data
3536
*/
3637
public function __construct(
3738
\Magento\Framework\Model\Context $context,
3839
\Magento\Framework\Registry $registry,
3940
\Magento\Authorization\Model\ResourceModel\Rules $resource,
40-
\Magento\Authorization\Model\ResourceModel\Permissions\Collection $resourceCollection,
41+
\Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection,
4142
array $data = []
4243
) {
4344
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

0 commit comments

Comments
 (0)