Skip to content

Commit f6e07fa

Browse files
author
Egor Shitikov
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-34014
2 parents f8b102f + ba82edc commit f6e07fa

File tree

2,944 files changed

+44849
-45328
lines changed

Some content is hidden

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

2,944 files changed

+44849
-45328
lines changed

‎CHANGELOG.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,69 @@
1+
0.42.0-beta9
2+
=============
3+
* Framework Improvements:
4+
* Layout Models are moved from Core module to appropriate modules
5+
* View components are moved from Core to Theme module
6+
* Rest of theme related configuration files are refactored
7+
* StoreManagerInterface is moved from Framework to App folder
8+
* ZF1 controller libraries are updated
9+
* Class definitions in multi-tenant mode are removed
10+
* DI configuration became more optimal: OM cached configuration uses the general pattern for all argument types in application
11+
* Varnish 4 configuration is updated
12+
* Layout Processing became more fast
13+
* HTML response minified
14+
* App Components and Specific Helper Components are moved from the Magento_Core Module
15+
* UI improvements:
16+
* Add to cart operation became asynchronous and doesn`t reload page (AJAX call)
17+
* Fixed Defects:
18+
* When Inline Translation is enabled, JQuery buttons for translate were broken
19+
* Base URL has invalid place inside Magento Admin Address on "Web Configuration" step of installation wizard
20+
* Inability of submit Product from keyboard while Product Creation
21+
* Sold products aren't displayed in Bestsellers
22+
* Compiled definitions can cause unexpected errors compared to runtime definitions
23+
* Accessibility improvements:
24+
* WAI-ARIA attributes are added to Frontend Layered Navigation and Customer Dropdown, Frontend Product Page Tabs, Frontend Cart Summary collapsible panels, Frontend forms and notifications, Frontend Checkout pages
25+
* Tests improvements:
26+
* Added mechanism of replacing 3-rd party credentials in functional tests
27+
* Update of end-to-end tests for create product, update product, promoted product, out of stock product, create product with new category, unassign products on category, create backend customer with injectable test
28+
* Various improvements:
29+
* JS template engine became unified on Backend and Frontend
30+
* Increased unit test coverage for Magento/Indexer module
31+
* Version number info became accessible at a public URL
32+
* GitHub requests:
33+
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subctegory
34+
* [#921](https://github.com/magento/magento2/issues/921) -- Change resource ids from Magento_Adminhtml::* to Magento_Backend
35+
36+
0.42.0-beta8
37+
=============
38+
* Various improvements:
39+
* Existing Builders were replaced with DataFactories in Customer and Tax modules
40+
* Refactored controller actions in the Checkout and CMS modules
41+
* Increased coverage with static tests for `.phtml` files
42+
* Moved Cookie related functionality from `Theme` and `Core` modules into a new `Cookie` module
43+
* Moved minfication configuration settings to the `View` library level
44+
* UI improvements:
45+
* Restyled installation wizard
46+
* Prepared styles for Dashboard in the Backend area
47+
* Framework improvements:
48+
* Added `setCustomAttribute` and `setCustomAttributes` methods to `ExtensibleDataInterface`
49+
* Added setter methods to data object interfaces
50+
* Replaced `Builders` with `Factories`
51+
* Added `DataObjectHelper.php` which contains the common set of methods of all builders
52+
* Refactored `__()` to return `Phrase` object
53+
* Allowed usage of `LocalizedException` on the framework's library level
54+
* Added expiration/lifetime management of frontend resources
55+
* Unified MTF configurations format for Framework, TestCase variations and TestCase scenario configurations
56+
* Fixed bugs:
57+
* Fixed an issue with product reviews list paging
58+
* Fixed an issue where sold products were not displayed in Bestsellers
59+
* Fixed an issue with image rendering on the CMS page on Frontend when `webserver rewrites = no`
60+
* GitHub requests:
61+
* [#790](https://github.com/magento/magento2/issues/790) -- Magento API fails in a CGI env (zf1 issue)
62+
* [#909](https://github.com/magento/magento2/issues/909) -- Manage Titles in popup window front-end issue
63+
* [#996](https://github.com/magento/magento2/issues/996) -- Pager block should support url "fragment".
64+
* [#985](https://github.com/magento/magento2/pull/985) -- Allow camelcase in vendorname for menus
65+
* [#1025](https://github.com/magento/magento2/pull/1025) -- Wrong parameter for getting base url for 'media' path in "Image" form element.
66+
167
0.42.0-beta7
268
=============
369
* Various improvements:

‎Gruntfile.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = function (grunt) {
99

1010
// Required plugins
1111
// _____________________________________________
12-
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
12+
13+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
14+
svgo = require('imagemin-svgo');
1315

1416
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1517

@@ -21,8 +23,6 @@ module.exports = function (grunt) {
2123
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
2224
});
2325

24-
var svgo = require('imagemin-svgo');
25-
2626
// Configuration
2727
// _____________________________________________
2828

@@ -318,7 +318,8 @@ module.exports = function (grunt) {
318318

319319
cssmin: {
320320
options: {
321-
report: 'gzip'
321+
report: 'gzip',
322+
keepSpecialComments: 0
322323
},
323324
setup: {
324325
files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
342343
}
343344
},
344345

346+
// Concatenation
347+
// ---------------------------------------------
348+
349+
concat: {
350+
options: {
351+
stripBanners: true,
352+
banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
353+
},
354+
setup: {
355+
src: '<%= path.css.setup %>/setup.css',
356+
dest: '<%= path.css.setup %>/setup.css'
357+
}
358+
},
359+
345360

346361
// Watches files for changes and runs tasks based on the changed files
347362
// ---------------------------------------------
@@ -545,7 +560,8 @@ module.exports = function (grunt) {
545560
grunt.task.run([
546561
'less:' + component,
547562
'autoprefixer:' + component,
548-
'cssmin:' + component
563+
'cssmin:' + component,
564+
'concat:' + component
549565
]);
550566
}
551567
if (component == undefined) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
1515
*/
1616
public function execute()
1717
{
18-
if (!$this->getRequest()->getPost()) {
18+
if (!$this->getRequest()->getPostValue()) {
1919
return;
2020
}
2121
$notificationId = (int)$this->getRequest()->getPost('id');

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
namespace Magento\AdminNotification\Model\System\Message;
1010

11+
use Magento\Store\Model\Store;
12+
1113
class Baseurl implements \Magento\Framework\Notification\MessageInterface
1214
{
1315
/**
@@ -21,7 +23,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2123
protected $_config;
2224

2325
/**
24-
* @var \Magento\Framework\Store\StoreManagerInterface
26+
* @var \Magento\Store\Model\StoreManagerInterface
2527
*/
2628
protected $_storeManager;
2729

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

3335
/**
3436
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
37+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3638
* @param \Magento\Framework\UrlInterface $urlBuilder
3739
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3840
*/
3941
public function __construct(
4042
\Magento\Framework\App\Config\ScopeConfigInterface $config,
41-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
43+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4244
\Magento\Framework\UrlInterface $urlBuilder,
4345
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4446
) {
@@ -56,9 +58,9 @@ public function __construct(
5658
protected function _getConfigUrl()
5759
{
5860
$output = '';
59-
$defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
61+
$defaultUnsecure = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
6062

61-
$defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
63+
$defaultSecure = $this->_config->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
6264

6365
if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
6466
$defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER

‎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/Model/System/Message/Security.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
namespace Magento\AdminNotification\Model\System\Message;
1010

11+
use Magento\Store\Model\Store;
12+
1113
class Security implements \Magento\Framework\Notification\MessageInterface
1214
{
1315
/**
@@ -93,7 +95,7 @@ private function _canShowNotification()
9395
*/
9496
private function _isFileAccessible()
9597
{
96-
$unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
98+
$unsecureBaseURL = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
9799

98100
/** @var $http \Magento\Framework\HTTP\Adapter\Curl */
99101
$http = $this->_curlFactory->create();

‎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-beta9",
7+
"magento/module-core": "0.42.0-beta9",
8+
"magento/module-backend": "0.42.0-beta9",
9+
"magento/framework": "0.42.0-beta9",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta7",
14+
"version": "0.42.0-beta9",
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">

0 commit comments

Comments
 (0)