Skip to content

Commit e462d42

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-38216-Reduce-Travis-Execution-Time
2 parents d1398a2 + a4d4b22 commit e462d42

File tree

1,050 files changed

+21971
-5362
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,050 files changed

+21971
-5362
lines changed

‎.htaccess

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
############################################
3737
## adjust memory limit
3838

39-
# php_value memory_limit 64M
4039
php_value memory_limit 768M
4140
php_value max_execution_time 18000
4241

‎CHANGELOG.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,78 @@
1+
0.74.0-beta12
2+
=============
3+
* MTF Improvements:
4+
* Functional tests maintenance
5+
* Framework improvements:
6+
* Customer entity table was transformed from EAV into a flat model to minimize DB operations
7+
* Improved admin authentication and removed bypass
8+
* Exposed CMS api's as web API
9+
* Fixed bugs:
10+
* Fixed an issue where "Add Item To Return" button became disabled after required item fields were filled on Frontend
11+
* Fixed an issue with fatal error during place order with non default time zone
12+
* Fixed an issue where it was not possible to filter backups on name
13+
* Fixed an issue where routeIdType did not allow numbers
14+
* Fixed an issue with discounted prices for fixed bundle product
15+
* Fixed an issue with catalog prices not including custom option prices
16+
* Fixed an issue with tier prices being displayed 4 characters
17+
* Fixed an issue with extra FPT labels in mini shopping cart
18+
* Fixed an issue where it was not possible to place orders for products with FPT and catalog prices including tax
19+
* Fixed an issue with FPT attribute being required when creating product
20+
* Fixed an issue where final price was not recalculated after selecting product options
21+
* Fixed an issue where tax labels were not displayed for Bundle options on 'multi-select' and 'dropdown' controls
22+
* Fixed an issue where filters were not shown on product reviews report grid
23+
* Fixed an issue where second customer address was not deleted from customer account
24+
* Fixed an issue where custom options pop-up was still displayed after submit
25+
* Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first atempt
26+
* Fixed an issue where customer invalid email message was not displayed
27+
* Fixed an issue where All Access Tokens for Customer without Tokens could not be revoked
28+
* Fixed an issue where it was impossible to add Product to Shopping Cart from shared Wishlist
29+
* Magento_Sendfriend module should have upper case 'F'
30+
* Fixed set of issues with Ui module
31+
* Fixed JavaScript error on Invoice creation page
32+
* Various improvements:
33+
* Hide payment credentials in debug log
34+
* Simplification of Payment Configuration
35+
* Introduced new Dialog widget
36+
* Github issues:
37+
* [#1330](https://github.com/magento/magento2/pull/1330) -- Removing unused memory limit in htaccess
38+
* [#1307](https://github.com/magento/magento2/pull/1307) -- Corrected a sentence by removing a word
39+
40+
0.74.0-beta11
41+
=============
42+
* Framework improvements:
43+
* Improved component Bookmarks component in scope of Enhanced Data Grids on CMS
44+
* Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS
45+
* Fixed bugs:
46+
* Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully
47+
* Fixed an issue where interceptors were Generated with Invalid __wakeup()
48+
* Fixed an issue where redirect on the current page was not working in certain conditions
49+
* Fixed an issue where first store could not be selected on frontend
50+
* Fixed an issue with performance toolkit category creation
51+
* Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
52+
* Fixed an issue where fatal error occured on Abandoned Carts report grid
53+
* Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
54+
* Fixed an issue where email was not required during Guest Checkout
55+
* Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
56+
* Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run
57+
* Fixed bug with broken JS i18n
58+
* Fixed an issue with wrong value at created_at updated_at fields after quote* save
59+
* Fixed an issue where customer could not be created in backend after adding Image type attribute
60+
* Fixed Sales InvoiceItem and Order data interfaces implementation
61+
* Fixed an issue with performance toolkit medium profile
62+
* Fixed an issue where Excel Formula Injection via CSV/XML export
63+
* Fixed an issue where it was not possible to open the Customers page in backend
64+
* Fixed an issue with internal server error after clicking Continue on Billing information
65+
* Fixed an issue where it was not possible to place order with Fedex shipping method
66+
* Various changes:
67+
* Magento Centinel Removal
68+
* Removed ability to have multi-statement queries
69+
* Test coverage:
70+
* Unit tests coverage
71+
* Covered php code by unit tests after new checkout implementation
72+
* Github issues:
73+
* [#424](https://github.com/magento/magento2/issues/424) -- Combine tier pricing messages into block sentences
74+
* [#1300](https://github.com/magento/magento2/issues/1300), [#1311](https://github.com/magento/magento2/issues/1311), [#1313](https://github.com/magento/magento2/issues/1313) -- Creating product error with startdate
75+
176
0.74.0-beta10
277
=============
378
* Framework improvements:

‎Gruntfile.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,17 @@ module.exports = function (grunt) {
6868
'less:luma',
6969
'less:backend'
7070
],
71+
7172
/**
7273
* Documentation
7374
*/
7475
documentation: [
76+
'replace:documentation',
7577
'less:documentation',
7678
'styledocco:documentation',
79+
'usebanner:documentationCss',
80+
'usebanner:documentationLess',
81+
'usebanner:documentationHtml',
7782
'clean:var',
7883
'clean:pub'
7984
],
@@ -82,12 +87,6 @@ module.exports = function (grunt) {
8287
'mage-minify:legacy'
8388
],
8489

85-
'documentation-banners': [
86-
'usebanner:documentationCss',
87-
'usebanner:documentationLess',
88-
'usebanner:documentationHtml'
89-
],
90-
9190
spec: function (theme) {
9291
var runner = require('./dev/tests/js/jasmine/spec_runner');
9392

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ After verifying your prerequisites, perform the following tasks in order to prep
6161
<h2>Contributing to the Magento 2 code base</h2>
6262
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
6363

64-
To make learn about how to make a contribution, click [here][1].
64+
To learn about how to make a contribution, click [here][1].
6565

6666
To learn about issues, click [here][2]. To open an issue, click [here][3].
6767

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
7373
* @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
7474
* @param \Magento\Framework\UrlInterface $urlBuilder
7575
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
76-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
76+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
7777
* @param array $data
7878
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7979
*/
@@ -87,7 +87,7 @@ public function __construct(
8787
\Magento\Framework\App\ProductMetadataInterface $productMetadata,
8888
\Magento\Framework\UrlInterface $urlBuilder,
8989
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
90-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
90+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
9191
array $data = []
9292
) {
9393
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

‎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.74.0-beta10",
7-
"magento/module-backend": "0.74.0-beta10",
8-
"magento/module-media-storage": "0.74.0-beta10",
9-
"magento/framework": "0.74.0-beta10",
6+
"magento/module-store": "0.74.0-beta12",
7+
"magento/module-backend": "0.74.0-beta12",
8+
"magento/module-media-storage": "0.74.0-beta12",
9+
"magento/framework": "0.74.0-beta12",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta10",
14+
"version": "0.74.0-beta12",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎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.74.0-beta10",
7-
"magento/framework": "0.74.0-beta10",
6+
"magento/module-backend": "0.74.0-beta12",
7+
"magento/framework": "0.74.0-beta12",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta10",
11+
"version": "0.74.0-beta12",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
2222
*/
2323
const SESSION_NAMESPACE = 'adminhtml';
2424

25+
/**
26+
* Authorization level of a basic admin session
27+
*/
28+
const ADMIN_RESOURCE = 'Magento_Backend::admin';
29+
2530
/**
2631
* Array of actions which can be processed without secret key validation
2732
*
@@ -97,7 +102,7 @@ public function __construct(Action\Context $context)
97102
*/
98103
protected function _isAllowed()
99104
{
100-
return true;
105+
return $this->_authorization->isAllowed(self::ADMIN_RESOURCE);
101106
}
102107

103108
/**
@@ -228,14 +233,10 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
228233
*/
229234
protected function _isUrlChecked()
230235
{
231-
return !$this->_actionFlag->get(
232-
'',
233-
self::FLAG_IS_URLS_CHECKED
234-
) && !$this->getRequest()->getParam(
235-
'forwarded'
236-
) && !$this->_getSession()->getIsUrlNotice(
237-
true
238-
) && !$this->_canUseBaseUrl;
236+
return !$this->_actionFlag->get('', self::FLAG_IS_URLS_CHECKED)
237+
&& !$this->getRequest()->isForwarded()
238+
&& !$this->_getSession()->getIsUrlNotice(true)
239+
&& !$this->_canUseBaseUrl;
239240
}
240241

241242
/**

‎app/code/Magento/Backend/App/Action/Plugin/Authentication.php

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -147,46 +147,25 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
147147
if ($request->getPost('login') && $this->_performLogin($request)) {
148148
$isRedirectNeeded = $this->_redirectIfNeededAfterLogin($request);
149149
}
150-
if (!$isRedirectNeeded && !$request->getParam('forwarded')) {
150+
if (!$isRedirectNeeded && !$request->isForwarded()) {
151151
if ($request->getParam('isIframe')) {
152-
$request->setParam(
153-
'forwarded',
154-
true
155-
)->setRouteName(
156-
'adminhtml'
157-
)->setControllerName(
158-
'auth'
159-
)->setActionName(
160-
'deniedIframe'
161-
)->setDispatched(
162-
false
163-
);
152+
$request->setForwarded(true)
153+
->setRouteName('adminhtml')
154+
->setControllerName('auth')
155+
->setActionName('deniedIframe')
156+
->setDispatched(false);
164157
} elseif ($request->getParam('isAjax')) {
165-
$request->setParam(
166-
'forwarded',
167-
true
168-
)->setRouteName(
169-
'adminhtml'
170-
)->setControllerName(
171-
'auth'
172-
)->setActionName(
173-
'deniedJson'
174-
)->setDispatched(
175-
false
176-
);
158+
$request->setForwarded(true)
159+
->setRouteName('adminhtml')
160+
->setControllerName('auth')
161+
->setActionName('deniedJson')
162+
->setDispatched(false);
177163
} else {
178-
$request->setParam(
179-
'forwarded',
180-
true
181-
)->setRouteName(
182-
'adminhtml'
183-
)->setControllerName(
184-
'auth'
185-
)->setActionName(
186-
'login'
187-
)->setDispatched(
188-
false
189-
);
164+
$request->setForwarded(true)
165+
->setRouteName('adminhtml')
166+
->setControllerName('auth')
167+
->setActionName('login')
168+
->setDispatched(false);
190169
}
191170
}
192171
}

‎app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,22 @@ protected function _prepareLayout()
3131

3232
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
3333

34-
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
34+
$isChartEnabled = $this->_scopeConfig->getValue(
35+
self::XML_PATH_ENABLE_CHARTS,
36+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
37+
);
38+
if ($isChartEnabled) {
3539
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3640
} else {
3741
$block = $this->getLayout()->createBlock(
3842
'Magento\Backend\Block\Template'
3943
)->setTemplate(
4044
'dashboard/graph/disabled.phtml'
4145
)->setConfigUrl(
42-
$this->getUrl('adminhtml/system_config/edit', ['section' => 'admin'])
46+
$this->getUrl(
47+
'adminhtml/system_config/edit',
48+
['section' => 'admin', '_fragment' => 'admin_dashboard-link']
49+
)
4350
);
4451
}
4552
$this->setChild('diagrams', $block);

0 commit comments

Comments
 (0)