Skip to content

Commit d496e7c

Browse files
author
Ivan Gavryshko
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-52448-cloud-customer-address
2 parents c6a14bb + a5fa3af commit d496e7c

File tree

660 files changed

+15095
-6865
lines changed

Some content is hidden

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

660 files changed

+15095
-6865
lines changed

‎.htaccess

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
# SetEnv MAGE_MODE developer
66

7-
############################################
8-
## overrides default umask value to allow using different
9-
## file permissions
10-
11-
# SetEnv MAGE_UMASK 022
12-
137
############################################
148
## uncomment these lines for CGI mode
159
## make sure to specify the correct cgi php binary file name
@@ -107,7 +101,7 @@
107101
# Insert filter on all content
108102
###SetOutputFilter DEFLATE
109103
# Insert filter on selected content types only
110-
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
104+
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml
111105

112106
# Netscape 4.x has some problems...
113107
#BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -196,6 +190,7 @@
196190

197191
AddDefaultCharset Off
198192
#AddDefaultCharset UTF-8
193+
AddType 'text/html; charset=UTF-8' html
199194

200195
<IfModule mod_expires.c>
201196

@@ -281,9 +276,48 @@
281276
order allow,deny
282277
deny from all
283278
</Files>
279+
<Files magento_umask>
280+
order allow,deny
281+
deny from all
282+
</Files>
284283

285284
################################
286285
## If running in cluster environment, uncomment this
287286
## http://developer.yahoo.com/performance/rules.html#etags
288287

289288
#FileETag none
289+
290+
# ######################################################################
291+
# # INTERNET EXPLORER #
292+
# ######################################################################
293+
294+
# ----------------------------------------------------------------------
295+
# | Document modes |
296+
# ----------------------------------------------------------------------
297+
298+
# Force Internet Explorer 8/9/10 to render pages in the highest mode
299+
# available in the various cases when it may not.
300+
#
301+
# https://hsivonen.fi/doctype/#ie8
302+
#
303+
# (!) Starting with Internet Explorer 11, document modes are deprecated.
304+
# If your business still relies on older web apps and services that were
305+
# designed for older versions of Internet Explorer, you might want to
306+
# consider enabling `Enterprise Mode` throughout your company.
307+
#
308+
# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
309+
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
310+
311+
<IfModule mod_headers.c>
312+
313+
Header set X-UA-Compatible "IE=edge"
314+
315+
# `mod_headers` cannot match based on the content-type, however,
316+
# the `X-UA-Compatible` response header should be send only for
317+
# HTML documents and not for the other resources.
318+
319+
<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
320+
Header unset X-UA-Compatible
321+
</FilesMatch>
322+
323+
</IfModule>

‎.htaccess.sample

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
# Insert filter on all content
101101
###SetOutputFilter DEFLATE
102102
# Insert filter on selected content types only
103-
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
103+
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml
104104

105105
# Netscape 4.x has some problems...
106106
#BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -189,6 +189,7 @@
189189

190190
AddDefaultCharset Off
191191
#AddDefaultCharset UTF-8
192+
AddType 'text/html; charset=UTF-8' html
192193

193194
<IfModule mod_expires.c>
194195

@@ -274,9 +275,48 @@
274275
order allow,deny
275276
deny from all
276277
</Files>
278+
<Files magento_umask>
279+
order allow,deny
280+
deny from all
281+
</Files>
277282

278283
################################
279284
## If running in cluster environment, uncomment this
280285
## http://developer.yahoo.com/performance/rules.html#etags
281286

282287
#FileETag none
288+
289+
# ######################################################################
290+
# # INTERNET EXPLORER #
291+
# ######################################################################
292+
293+
# ----------------------------------------------------------------------
294+
# | Document modes |
295+
# ----------------------------------------------------------------------
296+
297+
# Force Internet Explorer 8/9/10 to render pages in the highest mode
298+
# available in the various cases when it may not.
299+
#
300+
# https://hsivonen.fi/doctype/#ie8
301+
#
302+
# (!) Starting with Internet Explorer 11, document modes are deprecated.
303+
# If your business still relies on older web apps and services that were
304+
# designed for older versions of Internet Explorer, you might want to
305+
# consider enabling `Enterprise Mode` throughout your company.
306+
#
307+
# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
308+
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
309+
310+
<IfModule mod_headers.c>
311+
312+
Header set X-UA-Compatible "IE=edge"
313+
314+
# `mod_headers` cannot match based on the content-type, however,
315+
# the `X-UA-Compatible` response header should be send only for
316+
# HTML documents and not for the other resources.
317+
318+
<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
319+
Header unset X-UA-Compatible
320+
</FilesMatch>
321+
322+
</IfModule>

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.5
1312
- 5.6
1413
- 7.0
1514
env:
@@ -26,8 +25,6 @@ cache:
2625
directories: $HOME/.composer/cache
2726
matrix:
2827
exclude:
29-
- php: 5.6
30-
env: TEST_SUITE=static
3128
- php: 7.0
3229
env: TEST_SUITE=static
3330
before_install: ./dev/travis/before_install.sh

‎app/bootstrap.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
error_reporting(E_ALL);
1111
#ini_set('display_errors', 1);
1212

13-
/* Custom umask value may be provided in MAGE_UMASK environment variable */
14-
$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
15-
umask($mask);
16-
1713
/* PHP version validation */
1814
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50522) {
1915
if (PHP_SAPI == 'cli') {
@@ -34,6 +30,11 @@
3430
require_once __DIR__ . '/autoload.php';
3531
require_once BP . '/app/functions.php';
3632

33+
/* Custom umask value may be provided in optional mage_umask file in root */
34+
$umaskFile = BP . '/magento_umask';
35+
$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
36+
umask($mask);
37+
3738
if (!empty($_SERVER['MAGE_PROFILER'])
3839
&& isset($_SERVER['HTTP_ACCEPT'])
3940
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-store": "100.0.*",
7-
"magento/module-backend": "100.0.*",
8-
"magento/module-media-storage": "100.0.*",
9-
"magento/framework": "100.0.*",
6+
"magento/module-store": "100.1.*",
7+
"magento/module-backend": "100.1.*",
8+
"magento/module-media-storage": "100.1.*",
9+
"magento/framework": "100.1.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.0.2",
13+
"version": "100.1.0-rc1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-catalog": "100.0.*",
7-
"magento/module-catalog-inventory": "100.0.*",
8-
"magento/module-eav": "100.0.*",
9-
"magento/module-import-export": "100.0.*",
10-
"magento/module-catalog-import-export": "100.0.*",
11-
"magento/module-customer": "100.0.*",
12-
"magento/module-store": "100.0.*",
13-
"magento/framework": "100.0.*"
6+
"magento/module-catalog": "101.0.*",
7+
"magento/module-catalog-inventory": "100.1.*",
8+
"magento/module-eav": "100.1.*",
9+
"magento/module-import-export": "100.1.*",
10+
"magento/module-catalog-import-export": "100.1.*",
11+
"magento/module-customer": "100.1.*",
12+
"magento/module-store": "100.1.*",
13+
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.2",
16+
"version": "100.1.0-rc1",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-backend": "100.0.*",
7-
"magento/framework": "100.0.*"
6+
"magento/module-backend": "100.1.*",
7+
"magento/framework": "100.1.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.0.2",
10+
"version": "100.1.0-rc1",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.22|~5.6.0|~7.0.0",
6-
"magento/module-sales": "100.0.*",
7-
"magento/module-store": "100.0.*",
8-
"magento/module-quote": "100.0.*",
9-
"magento/module-checkout": "100.0.*",
10-
"magento/module-backend": "100.0.*",
11-
"magento/module-payment": "100.0.*",
12-
"magento/module-catalog": "100.0.*",
13-
"magento/framework": "100.0.*"
6+
"magento/module-sales": "100.1.*",
7+
"magento/module-store": "100.1.*",
8+
"magento/module-quote": "100.1.*",
9+
"magento/module-checkout": "100.1.*",
10+
"magento/module-backend": "100.1.*",
11+
"magento/module-payment": "100.1.*",
12+
"magento/module-catalog": "101.0.*",
13+
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.0.2",
16+
"version": "100.1.0-rc1",
1717
"license": [
1818
"proprietary"
1919
],

‎app/code/Magento/Backend/Block/Widget/Grid/Export.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ public function _exportIterateCollection($callback, array $args)
257257
$break = false;
258258

259259
while ($break !== true) {
260+
$originalCollection->clear();
260261
$originalCollection->setPageSize($this->getExportPageSize());
261262
$originalCollection->setCurPage($page);
262263
$originalCollection->load();

‎app/code/Magento/Backend/Model/Session/Quote.php

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

88
use Magento\Customer\Api\CustomerRepositoryInterface;
99
use Magento\Customer\Api\GroupManagementInterface;
10+
use Magento\Framework\App\ObjectManager;
11+
use Magento\Quote\Api\CartManagementInterface;
1012

1113
/**
1214
* Adminhtml quote session
@@ -79,6 +81,11 @@ class Quote extends \Magento\Framework\Session\SessionManager
7981
*/
8082
protected $quoteFactory;
8183

84+
/**
85+
* @var \Magento\Quote\Api\CartManagementInterface;
86+
*/
87+
private $cartManagement;
88+
8289
/**
8390
* @param \Magento\Framework\App\Request\Http $request
8491
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -143,15 +150,15 @@ public function __construct(
143150
*/
144151
public function getQuote()
145152
{
153+
$cartManagement = $this->getCartManagement();
154+
146155
if ($this->_quote === null) {
147-
$this->_quote = $this->quoteFactory->create();
148156
if ($this->getStoreId()) {
149157
if (!$this->getQuoteId()) {
150-
$this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId())
151-
->setIsActive(false)
152-
->setStoreId($this->getStoreId());
153-
$this->quoteRepository->save($this->_quote);
154-
$this->setQuoteId($this->_quote->getId());
158+
$this->setQuoteId($cartManagement->createEmptyCart());
159+
$this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
160+
$this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
161+
$this->_quote->setIsActive(false);
155162
} else {
156163
$this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
157164
$this->_quote->setStoreId($this->getStoreId());
@@ -169,6 +176,18 @@ public function getQuote()
169176
return $this->_quote;
170177
}
171178

179+
/**
180+
* @return CartManagementInterface
181+
* @deprecated
182+
*/
183+
private function getCartManagement()
184+
{
185+
if ($this->cartManagement === null) {
186+
$this->cartManagement = ObjectManager::getInstance()->get(CartManagementInterface::class);
187+
}
188+
return $this->cartManagement;
189+
}
190+
172191
/**
173192
* Retrieve store model object
174193
*

0 commit comments

Comments
 (0)