Skip to content

Commit d759cb2

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-34612-Code-Coverage
2 parents 5f3cbe7 + 94e6406 commit d759cb2

File tree

1,099 files changed

+8104
-15275
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,099 files changed

+8104
-15275
lines changed

‎.htaccess

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -167,15 +172,11 @@
167172
## http://developer.yahoo.com/performance/rules.html#expires
168173

169174
ExpiresDefault "access plus 1 year"
175+
ExpiresByType text/html A0
176+
ExpiresByType text/plain A0
170177

171178
</IfModule>
172179

173-
############################################
174-
## By default allow all access
175-
176-
Order allow,deny
177-
Allow from all
178-
179180
###########################################
180181
## Deny access to release notes to prevent disclosure of the installed Magento version
181182

‎.htaccess.sample

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -164,15 +169,11 @@
164169
## http://developer.yahoo.com/performance/rules.html#expires
165170

166171
ExpiresDefault "access plus 1 year"
172+
ExpiresByType text/html A0
173+
ExpiresByType text/plain A0
167174

168175
</IfModule>
169176

170-
############################################
171-
## By default allow all access
172-
173-
Order allow,deny
174-
Allow from all
175-
176177
###########################################
177178
## Deny access to release notes to prevent disclosure of the installed Magento version
178179

‎CHANGELOG.md

Lines changed: 212 additions & 41 deletions
Large diffs are not rendered by default.

‎Gruntfile.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ module.exports = function (grunt) {
6060
'less:luma',
6161
'less:backend'
6262
],
63-
63+
/**
64+
* Styles for backend theme
65+
*/
66+
backend: [
67+
'less:backend',
68+
'replace:escapeCalc',
69+
'less:override'
70+
],
6471
/**
6572
* Documentation
6673
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected function _construct()
114114
public function getFeedUrl()
115115
{
116116
$httpPath = $this->_backendConfig->isSetFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
117-
if (is_null($this->_feedUrl)) {
117+
if ($this->_feedUrl === null) {
118118
$this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
119119
}
120120
return $this->_feedUrl;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function getSeverities($severity = null)
5555
MessageInterface::SEVERITY_NOTICE => __('notice'),
5656
];
5757

58-
if (!is_null($severity)) {
58+
if ($severity !== null) {
5959
if (isset($severities[$severity])) {
6060
return $severities[$severity];
6161
}

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ public function getUserType()
7272
*/
7373
protected function getUserContext()
7474
{
75-
if (is_null($this->chosenUserContext)) {
75+
if ($this->chosenUserContext === null) {
7676
/** @var UserContextInterface $userContext */
7777
foreach ($this->userContexts as $userContext) {
78-
if ($userContext->getUserType() && !is_null($userContext->getUserId())) {
78+
if ($userContext->getUserType() && $userContext->getUserId() !== null) {
7979
$this->chosenUserContext = $userContext;
8080
break;
8181
}
8282
}
83-
if (is_null($this->chosenUserContext)) {
83+
if ($this->chosenUserContext === null) {
8484
$this->chosenUserContext = false;
8585
}
8686
}

‎app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ protected function createUserContextMock($userId = null, $userType = null)
161161
{
162162
$useContextMock = $this->getMockBuilder('Magento\Authorization\Model\CompositeUserContext')
163163
->disableOriginalConstructor()->setMethods(['getUserId', 'getUserType'])->getMock();
164-
if (!is_null($userId) && !is_null($userType)) {
164+
if ($userId !== null && $userType !== null) {
165165
$useContextMock->expects($this->any())->method('getUserId')->will($this->returnValue($userId));
166166
$useContextMock->expects($this->any())->method('getUserType')->will($this->returnValue($userType));
167167
}

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

0 commit comments

Comments
 (0)