Skip to content

Commit 4a8e697

Browse files
slavvkaslavvka
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-30789
Conflicts: app/etc/di.xml dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php lib/internal/Magento/Framework/View/Model/Layout/Merge.php
2 parents a84569a + dc51ad1 commit 4a8e697

File tree

1,885 files changed

+21250
-23474
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,885 files changed

+21250
-23474
lines changed

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
0.42.0-beta8
2+
=============
3+
* Various improvements:
4+
* Existing Builders were replaced with DataFactories in Customer and Tax modules
5+
* Refactored controller actions in the Checkout and CMS modules
6+
* Increased coverage with static tests for `.phtml` files
7+
* Moved Cookie related functionality from `Theme` and `Core` modules into a new `Cookie` module
8+
* Moved minfication configuration settings to the `View` library level
9+
* UI improvements:
10+
* Restyled installation wizard
11+
* Prepared styles for Dashboard in the Backend area
12+
* Framework improvements:
13+
* Added `setCustomAttribute` and `setCustomAttributes` methods to `ExtensibleDataInterface`
14+
* Added setter methods to data object interfaces
15+
* Replaced `Builders` with `Factories`
16+
* Added `DataObjectHelper.php` which contains the common set of methods of all builders
17+
* Refactored `__()` to return `Phrase` object
18+
* Allowed usage of `LocalizedException` on the framework's library level
19+
* Added expiration/lifetime management of frontend resources
20+
* Unified MTF configurations format for Framework, TestCase variations and TestCase scenario configurations
21+
* Fixed bugs:
22+
* Fixed an issue with product reviews list paging
23+
* Fixed an issue where sold products were not displayed in Bestsellers
24+
* Fixed an issue with image rendering on the CMS page on Frontend when `webserver rewrites = no`
25+
* GitHub requests:
26+
* [#790](https://github.com/magento/magento2/issues/790) -- Magento API fails in a CGI env (zf1 issue)
27+
* [#909](https://github.com/magento/magento2/issues/909) -- Manage Titles in popup window front-end issue
28+
* [#996](https://github.com/magento/magento2/issues/996) -- Pager block should support url "fragment".
29+
* [#985](https://github.com/magento/magento2/pull/985) -- Allow camelcase in vendorname for menus
30+
* [#1025](https://github.com/magento/magento2/pull/1025) -- Wrong parameter for getting base url for 'media' path in "Image" form element.
31+
132
0.42.0-beta7
233
=============
334
* Various improvements:

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2121
protected $_config;
2222

2323
/**
24-
* @var \Magento\Framework\Store\StoreManagerInterface
24+
* @var \Magento\Store\Model\StoreManagerInterface
2525
*/
2626
protected $_storeManager;
2727

@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
3232

3333
/**
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
35+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3636
* @param \Magento\Framework\UrlInterface $urlBuilder
3737
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3838
*/
3939
public function __construct(
4040
\Magento\Framework\App\Config\ScopeConfigInterface $config,
41-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
41+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4242
\Magento\Framework\UrlInterface $urlBuilder,
4343
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4444
) {

‎app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getIdentity()
6969
public function isDisplayed()
7070
{
7171
return $this->_authorization->isAllowed(
72-
'Magento_Adminhtml::cache'
72+
'Magento_Backend::cache'
7373
) && count(
7474
$this->_getCacheTypesForRefresh()
7575
) > 0;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta7",
7-
"magento/module-core": "0.42.0-beta7",
8-
"magento/module-backend": "0.42.0-beta7",
9-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-core": "0.42.0-beta8",
8+
"magento/module-backend": "0.42.0-beta8",
9+
"magento/framework": "0.42.0-beta8",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta7",
14+
"version": "0.42.0-beta8",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdminNotification/etc/acl.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
99
<acl>
1010
<resources>
11-
<resource id="Magento_Adminhtml::admin">
12-
<resource id="Magento_Adminhtml::system">
13-
<resource id="Magento_Adminhtml::system_other_settings">
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::system">
13+
<resource id="Magento_Backend::system_other_settings">
1414
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
1515
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
1616
<resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />

‎app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
99
<router id="admin">
1010
<route id="adminhtml">
11-
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />
11+
<module name="Magento_AdminNotification" before="Magento_Backend" />
1212
</route>
1313
</router>
1414
</config>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="Magento_Core::prototype/magento.css"/>
10+
<css src="Magento_Theme::prototype/magento.css"/>
1111
</head>
1212
<body>
1313
<referenceContainer name="notifications">

‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
2525
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
2626
<time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
27-
<button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
27+
<button type="button" class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
2828
<div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
2929
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
3030
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,60 @@
22
* Copyright © 2015 Magento. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
/*jshint jquery:true*/
65
define([
7-
"jquery",
8-
"jquery/ui",
9-
"jquery/template"
10-
], function($){
11-
12-
$.template(
13-
'systemMessageDialog',
14-
'<li class="{{if severity == 1}}error{{else}}warning{{/if}}">{{html text}}</li>'
15-
);
6+
'jquery',
7+
'mage/template',
8+
'jquery/ui'
9+
], function ($, mageTemplate) {
10+
'use strict';
1611

1712
$.widget('mage.systemMessageDialog', $.ui.dialog, {
1813
options: {
19-
systemMessageTemplate: 'systemMessageDialog'
14+
systemMessageTemplate:
15+
'<% _.each(data.items, function(item) { %>' +
16+
'<li class="<% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
17+
'<%= item.text %>' +
18+
'</li>' +
19+
'<% }); %>'
2020
},
21-
open: function(severity) {
21+
22+
open: function (severity) {
2223
var superMethod = $.proxy(this._super, this);
24+
2325
$.ajax({
2426
url: this.options.ajaxUrl,
2527
type: 'GET',
26-
data: {severity: severity}
27-
}).done($.proxy(function(data) {
28+
data: {
29+
severity: severity
30+
}
31+
}).done($.proxy(function (data) {
32+
var tmpl = mageTemplate(this.options.systemMessageTemplate, {
33+
data: {
34+
items: data
35+
}
36+
});
37+
38+
tmpl = $(tmpl);
39+
2840
this.element.html(
29-
$('<ul />', {'class': "message-system-list"}).append(
30-
$.tmpl(this.options.systemMessageTemplate, data)
31-
)
41+
$('<ul />', {
42+
'class': 'message-system-list'
43+
}).append(tmpl)
3244
).trigger('contentUpdated');
45+
3346
superMethod();
3447
}, this));
48+
3549
return this;
3650
}
3751
});
3852

39-
$(document).ready(function(){
40-
$('#system_messages .message-system-short .error').on('click', function() {
53+
$(document).ready(function () {
54+
$('#system_messages .message-system-short .error').on('click', function () {
4155
$('#message-system-all').systemMessageDialog('open', 1);
4256
});
43-
$('#system_messages .message-system-short .warning').on('click', function() {
57+
58+
$('#system_messages .message-system-short .warning').on('click', function () {
4459
$('#message-system-all').systemMessageDialog('open', 2);
4560
});
4661
});

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta7",
7-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-backend": "0.42.0-beta8",
7+
"magento/framework": "0.42.0-beta8",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta7",
11+
"version": "0.42.0-beta8",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

0 commit comments

Comments
 (0)