Skip to content

Commit c1fb3cb

Browse files
author
Yuri Kovsher
committed
Merge remote-tracking branch 'main-ce/develop' into MAGETWO-33062
2 parents 2f74854 + 7e07209 commit c1fb3cb

File tree

1,060 files changed

+19023
-10655
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,060 files changed

+19023
-10655
lines changed

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
0.42.0-beta6
2+
=============
3+
* Various improvements:
4+
* Implemented caching for WebAPI configuration
5+
* Improved tests coverage of the CurrencySymbol module
6+
* Table catalogsearch_fulltext is setting up with ENGINE=InnoDB
7+
* Improved unit test coverage of the Catalog related functionality
8+
* Optimized JS dependencies
9+
* Refactored controller actions in the Sales module
10+
* Refactored controller actions in the Customer module
11+
* Removed the assertion for the exact number of attributes in API-functional tests for customer metadata.
12+
* Refactored API code for the CheckoutAgreements module
13+
* Refactored API code for the GiftMessage module
14+
* Refactored API for the Checkout module
15+
* Fixed bugs:
16+
* Fixed an where issue were WebAPI generated the wrong WSDL
17+
* Fixed an issue where Catalog, Checkout, Customer API ACLs did not support AJAX use case(s)
18+
* Fixed an issue where SOAP tests failed after upgrading to ZF 1.12.9
19+
* Fixed an issue where the 'There is no data for export' message was displayed permanently after invalid search
20+
* Fixed an issue where there was no ability to set category position during creation it
21+
* Fixed a CSS issue where certain images were absent on banners ()
22+
* Fixed an issue where the 'Date Of Birth' value was i reset to current date on the customer form)
23+
* Fixed an issue where the behavior of the "Terms and Conditions" validation on multiple address checkout was different from the one for the onepage checkout
24+
* Fixed an issue where it was impossible to checkout with multiple addresses
25+
* Fixed an issue where the 'This is a required field ' message was not displayed for "Terms and Conditions" if the latter was not selected
26+
* GitHub Requests:
27+
* [#963](https://github.com/magento/magento2/pull/963) -- Default Accept header
28+
* [#995](https://github.com/magento/magento2/pull/995) -- Prevent a warning in activated developer mode when 'plugins' is no array
29+
* [#866](https://github.com/magento/magento2/issues/866) -- Configurable product attribute scope
30+
* [#965](https://github.com/magento/magento2/pull/965) -- extra tests for current interception behavior
31+
* Service Contracts:
32+
* The Downloadable module basic implementation
33+
* Framework improvements:
34+
* Refactored and covered with tests the classes with high CRAP value (>50)
35+
* Moved Theme Management changes, Design changes, Design\Backend modules, and Observer components from the Core module to the Theme module
36+
* Moved Debug Hints models from the Core module to the newly added Developer module
37+
* Moved URL components, Factory, and EntityFactory from the Core module to the Magento Framework
38+
* UI improvements:
39+
* Compressed and resized images
40+
* Added new base styles for the Admin re-design
41+
* Added the WAI-ARIA attributes are to the Search Autocomplete on the storefront
42+
* Added visual style for the 'skip to content' attribute on the storefront
43+
* Fixed the style of persistent login messages on the storefront for all themes
44+
* Fixed the style of scrolling for Categories with long names in the Admin
45+
* Fixed the "css/print.css" file path on the storefront pages for all themes
46+
* Tests improvements:
47+
* Converted all fixtures/repositories for functional tests to .xml files
48+
* Improved interaction between webdriver and the new Magento JS forms
49+
* Increased unit and integration tests coverage
50+
151
0.42.0-beta5
252
=============
353
* UI improvements:

‎Gruntfile.js

Lines changed: 65 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@
44

55
// For performance use one level down: 'name/{,*/}*.js'
66
// If you want to recursively match all subfolders, use: 'name/**/*.js'
7-
8-
'use strict';
9-
107
module.exports = function (grunt) {
8+
'use strict';
119

1210
// Required plugins
1311
// _____________________________________________
12+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
1413

1514
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1615

1716
// Time how long tasks take. Can help when optimizing build times
1817
require('time-grunt')(grunt);
1918

2019
// Load grunt tasks automatically
21-
require('load-grunt-tasks')(grunt);
20+
require('load-grunt-tasks')(grunt, {
21+
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
22+
});
2223

2324
var svgo = require('imagemin-svgo');
2425

@@ -42,7 +43,8 @@ module.exports = function (grunt) {
4243
uglify: {
4344
legacy: 'lib/web/legacy-build.min.js'
4445
},
45-
doc: 'lib/web/css/docs'
46+
doc: 'lib/web/css/docs',
47+
spec: 'dev/tests/js/spec'
4648
};
4749

4850
// Define Themes
@@ -459,8 +461,45 @@ module.exports = function (grunt) {
459461
'<%= path.doc %>': '<%= path.doc %>/source'
460462
}
461463
}
462-
}
464+
},
463465

466+
specRunner: {
467+
options: {
468+
shareDir: 'base'
469+
},
470+
backend: {
471+
options: {
472+
port: 8000,
473+
areaDir: 'adminhtml',
474+
theme: 'backend'
475+
}
476+
},
477+
frontend: {
478+
options: {
479+
port: 3000,
480+
areaDir: 'frontend',
481+
theme: 'blank'
482+
}
483+
},
484+
lib: {
485+
options: {
486+
port: 8080
487+
}
488+
}
489+
},
490+
491+
jasmine: {
492+
'options': {
493+
template: require('grunt-template-jasmine-requirejs'),
494+
ignoreEmpty: true
495+
},
496+
'lib-unit': specRunner.configure('unit', 'lib', 8080),
497+
'lib-integration': specRunner.configure('integration', 'lib', 8080),
498+
'backend-unit': specRunner.configure('unit', 'adminhtml', 8000),
499+
'backend-integration': specRunner.configure('integration', 'adminhtml', 8000),
500+
'frontend-unit': specRunner.configure('unit', 'frontend', 3000),
501+
'frontend-integration': specRunner.configure('integration', 'frontend', 3000)
502+
}
464503
});
465504

466505
// Assembling tasks
@@ -514,4 +553,24 @@ module.exports = function (grunt) {
514553
}
515554
});
516555

556+
// Tests
557+
// ---------------------------------------------
558+
559+
grunt.registerTask('spec', [
560+
'specRunner:lib',
561+
'specRunner:backend',
562+
'specRunner:frontend'
563+
]);
564+
565+
grunt.registerTask('unit', [
566+
'jasmine:lib-unit',
567+
'jasmine:backend-unit',
568+
'jasmine:frontend-unit'
569+
]);
570+
571+
grunt.registerTask('integration', [
572+
'jasmine:lib-integration',
573+
'jasmine:backend-integration',
574+
'jasmine:frontend-integration'
575+
]);
517576
};

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Use the following table to verify you have the correct prerequisites to install
3232
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
3333
</tr>
3434
<tr>
35-
<td>PHP 5.4.x (where x = 11 or later) or 5.5.x</td>
35+
<td>PHP 5.5.x or 5.6.x</td>
3636
<td><code>php -v</code></td>
3737
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
3838
</tr>

‎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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-core": "0.42.0-beta5",
8-
"magento/module-backend": "0.42.0-beta5",
9-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-core": "0.42.0-beta6",
8+
"magento/module-backend": "0.42.0-beta6",
9+
"magento/framework": "0.42.0-beta6",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta5",
14+
"version": "0.42.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*/
1414
?>
1515
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
16-
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($this->getSeverityText())) ?>">
16+
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
1717
<div class="popup-inner">
1818
<header class="popup-header">
19-
<h2 class="popup-title"><?php echo $this->getHeaderText(); ?></h2>
19+
<h2 class="popup-title"><?php echo $block->getHeaderText(); ?></h2>
2020
</header>
2121
<div class="popup-content">
22-
<span><?php echo $this->getSeverityText();?></span>
23-
<p class="message-text"><?php echo $this->getNoticeMessageText(); ?></p>
22+
<span><?php echo $block->getSeverityText();?></span>
23+
<p class="message-text"><?php echo $block->getNoticeMessageText(); ?></p>
2424

25-
<a href="<?php echo $this->getNoticeMessageUrl(); ?>"><?php echo $this->getReadDetailsText(); ?></a>
25+
<a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
2626
</div>
2727
<span class="close" data-dismiss="popup" title="<?php echo __('Close popup'); ?>"><?php echo __('Close'); ?></span>
2828
</div>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<?php /** @var $this \Magento\AdminNotification\Block\System\Messages */ ?>
10+
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
1111

12-
<?php $lastCritical = $this->getLastCritical();?>
12+
<?php $lastCritical = $block->getLastCritical();?>
1313
<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
1414
<div class="message-system-inner">
1515
<?php if ($lastCritical): ?>
@@ -21,13 +21,13 @@
2121
<?php endif; ?>
2222
<div class="message-system-short">
2323
System Messages:
24-
<?php if ($this->getCriticalCount()): ?>
25-
<span class="error"><a href="#" title="<?php echo $this->escapeHtml(__('Critical System Messages'));?>"><?php echo $this->getCriticalCount();?></a></span>
24+
<?php if ($block->getCriticalCount()): ?>
25+
<span class="error"><a href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>"><?php echo $block->getCriticalCount();?></a></span>
2626
<?php endif;?>
27-
<?php if ($this->getMajorCount()): ?>
28-
<span class="warning"><a href="#" title="<?php echo $this->escapeHtml(__('Major System Messages'));?>"><?php echo $this->getMajorCount();?></a></span>
27+
<?php if ($block->getMajorCount()): ?>
28+
<span class="warning"><a href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>"><?php echo $block->getMajorCount();?></a></span>
2929
<?php endif;?>
3030
</div>
31-
<div id="message-system-all" title="<?php echo $this->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $this->escapeHtml($this->getSystemMessageDialogJson());?>'></div>
31+
<div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
3232
</div>
3333
</div>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<?php /** @var $this \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
11-
<div id="system_messages_list" title="<?php echo $this->escapeHtml($this->getPopupTitle()); ?>">
10+
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
11+
<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
1212
<ul class="message-system-list">
13-
<?php foreach ($this->getUnreadMessages() as $message): ?>
14-
<li class="<?php echo $this->getItemClass($message);?>">
13+
<?php foreach ($block->getUnreadMessages() as $message): ?>
14+
<li class="<?php echo $block->getItemClass($message);?>">
1515
<?php echo $message->getText();?>
1616
</li>
1717
<?php endforeach;?>

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@
88

99
?>
1010
<?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
11-
<?php $notificationCount = $this->getUnreadNotificationCount(); ?>
12-
<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
11+
<?php $notificationCount = $block->getUnreadNotificationCount(); ?>
12+
<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $block->escapeHtml($notificationCount); ?>">
1313
<?php if ($notificationCount > 0) : ?>
14-
<a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
14+
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
1515
<span class="text"><?php echo __('Notifications'); ?></span>
16-
<span class="counter qty"><?php echo $this->escapeHtml($notificationCount); ?></span>
16+
<span class="counter qty"><?php echo $block->escapeHtml($notificationCount); ?></span>
1717
</a>
18-
<ul class="dropdown-menu notifications-list" data-mark-as-read-url="<?php echo $this->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
19-
<?php foreach ($this->getLatestUnreadNotifications() as $notification) : ?>
18+
<ul class="dropdown-menu notifications-list" data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
19+
<?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
2020
<?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
2121
<li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
22-
data-notification-id="<?php echo $this->escapeHtml($notification->getId()); ?>"
22+
data-notification-id="<?php echo $block->escapeHtml($notification->getId()); ?>"
2323
data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
24-
<strong class="notifications-entry-title"><?php echo $this->escapeHtml($notification->getTitle()); ?></strong>
25-
<span class="notifications-entry-description"><?php echo $this->escapeHtml($notification->getDescription()); ?></span>
26-
<time class="notifications-entry-time"><?php echo $this->escapeHtml($this->formatNotificationDate($notification->getDateAdded())); ?></time>
24+
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
25+
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
26+
<time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
2727
<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'); ?>">
29-
<strong class="notifications-entry-title"><?php echo $this->escapeHtml($notification->getTitle()); ?></strong>
30-
<span class="notifications-entry-description"><?php echo $this->escapeHtml($notification->getDescription()); ?></span>
29+
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
30+
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
3131
<div class="actions notifications-entry-actions">
32-
<a class="notifications-url" href="<?php echo $this->escapeUrl($notification->getUrl()); ?>" target="_blank"><?php echo __('Read Details'); ?></a>
32+
<a class="notifications-url" href="<?php echo $block->escapeUrl($notification->getUrl()); ?>" target="_blank"><?php echo __('Read Details'); ?></a>
3333
</div>
34-
<time class="notifications-entry-time"><?php echo $this->escapeHtml($this->formatNotificationDate($notification->getDateAdded())); ?></time>
34+
<time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
3535
</div>
3636
</li>
3737
<?php endforeach; ?>
3838
<li class="last">
39-
<a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action more notification-more"><?php echo __('See All (%1 unread)', $notificationCount); ?></a>
39+
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action more notification-more"><?php echo __('See All (%1 unread)', $notificationCount); ?></a>
4040
</li>
4141
</ul>
4242
<?php else : ?>
43-
<a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action empty" title="<?php echo __('Notifications'); ?>">
43+
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action empty" title="<?php echo __('Notifications'); ?>">
4444
<span class="text"><?php echo __('Notifications'); ?></span>
4545
</a>
4646
<?php endif; ?>

‎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.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta5",
7-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-backend": "0.42.0-beta6",
7+
"magento/framework": "0.42.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta5",
11+
"version": "0.42.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ public function getGridIdsJson()
260260
return '';
261261
}
262262

263-
$gridIds = $this->getParentBlock()->getCollection()->getAllIds();
263+
/** @var \Magento\Framework\Data\Collection $allIdsCollection */
264+
$allIdsCollection = clone $this->getParentBlock()->getCollection();
265+
$gridIds = $allIdsCollection->clear()->setPageSize(0)->getAllIds();
264266

265267
if (!empty($gridIds)) {
266268
return join(",", $gridIds);

0 commit comments

Comments
 (0)