Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d74e78b

Browse files
author
Oleksandr Karpenko
committed
Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-53010
Conflicts: app/code/Magento/Email/composer.json
2 parents 2f32aed + 3561b66 commit d74e78b

File tree

632 files changed

+9010
-6042
lines changed

Some content is hidden

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

632 files changed

+9010
-6042
lines changed

‎.htaccess

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206

207207
###########################################
208208
## Deny access to root files to hide sensitive application information
209-
RedirectMatch 404 /\.git
209+
RedirectMatch 403 /\.git
210210

211211
<Files composer.json>
212212
order allow,deny
@@ -277,10 +277,14 @@
277277
deny from all
278278
</Files>
279279
<Files magento_umask>
280-
order allow,deny
281-
deny from all
280+
order allow,deny
281+
deny from all
282282
</Files>
283283

284+
# For 404s and 403s that aren't handled by the application, show plain 404 response
285+
ErrorDocument 404 /pub/errors/404.php
286+
ErrorDocument 403 /pub/errors/404.php
287+
284288
################################
285289
## If running in cluster environment, uncomment this
286290
## http://developer.yahoo.com/performance/rules.html#etags

‎.htaccess.sample

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
############################################
2-
## Optional override of deployment mode. We recommend you use the
3-
## command bin/magento deploy:mode:set to switch modes instead
4-
# SetEnv MAGE_MODE default # or production or developer
2+
## overrides deployment configuration mode value
3+
## use command bin/magento deploy:mode:set to switch modes
4+
5+
# SetEnv MAGE_MODE developer
56

67
############################################
7-
## Uncomment these lines for CGI mode.
8-
## Make sure to specify the correct cgi php binary file name
8+
## uncomment these lines for CGI mode
9+
## make sure to specify the correct cgi php binary file name
910
## it might be /cgi-bin/php-cgi
1011

1112
# Action php5-cgi /cgi-bin/php5-cgi
@@ -16,42 +17,42 @@
1617

1718
# Options -MultiViews
1819

19-
## You might also need to add this line to php.ini
20+
## you might also need to add this line to php.ini
2021
## cgi.fix_pathinfo = 1
21-
## If it still doesn't work, rename php.ini to php5.ini
22+
## if it still doesn't work, rename php.ini to php5.ini
2223

2324
############################################
24-
## This line is specific for 1and1 hosting
25+
## this line is specific for 1and1 hosting
2526

2627
#AddType x-mapp-php5 .php
2728
#AddHandler x-mapp-php5 .php
2829

2930
############################################
30-
## Default index file
31+
## default index file
3132

3233
DirectoryIndex index.php
3334

3435
<IfModule mod_php5.c>
3536

3637
############################################
37-
## Adjust memory limit
38+
## adjust memory limit
3839

3940
php_value memory_limit 768M
4041
php_value max_execution_time 18000
4142

4243
############################################
43-
## Disable automatic session start
44+
## disable automatic session start
4445
## before autoload was initialized
4546

4647
php_flag session.auto_start off
4748

4849
############################################
49-
## Enable resulting html compression
50+
## enable resulting html compression
5051

5152
#php_flag zlib.output_compression on
5253

5354
###########################################
54-
## Disable user agent verification to not break multiple image upload
55+
## disable user agent verification to not break multiple image upload
5556

5657
php_flag suhosin.session.cryptua off
5758

@@ -60,32 +61,32 @@
6061
<IfModule mod_php7.c>
6162

6263
############################################
63-
## Adjust memory limit
64+
## adjust memory limit
6465

6566
php_value memory_limit 768M
6667
php_value max_execution_time 18000
6768

6869
############################################
69-
## Disable automatic session start
70+
## disable automatic session start
7071
## before autoload was initialized
7172

7273
php_flag session.auto_start off
7374

7475
############################################
75-
## Enable resulting html compression
76+
## enable resulting html compression
7677

7778
#php_flag zlib.output_compression on
7879

7980
###########################################
80-
## Disable user agent verification to not break multiple image upload
81+
## disable user agent verification to not break multiple image upload
8182

8283
php_flag suhosin.session.cryptua off
8384

8485
</IfModule>
8586

8687
<IfModule mod_security.c>
8788
###########################################
88-
## Disable POST processing to not break multiple image upload
89+
## disable POST processing to not break multiple image upload
8990

9091
SecFilterEngine Off
9192
SecFilterScanPOST Off
@@ -94,7 +95,7 @@
9495
<IfModule mod_deflate.c>
9596

9697
############################################
97-
## Enable apache served files compression
98+
## enable apache served files compression
9899
## http://developer.yahoo.com/performance/rules.html#gzip
99100

100101
# Insert filter on all content
@@ -122,14 +123,14 @@
122123
<IfModule mod_ssl.c>
123124

124125
############################################
125-
## Make HTTPS env vars available for CGI mode
126+
## make HTTPS env vars available for CGI mode
126127

127128
SSLOptions StdEnvVars
128129

129130
</IfModule>
130131

131132
############################################
132-
## Workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
133+
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
133134
## Please, set it on virtual host configuration level
134135

135136
## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
@@ -138,19 +139,19 @@
138139
<IfModule mod_rewrite.c>
139140

140141
############################################
141-
## Enable rewrites
142+
## enable rewrites
142143

143144
Options +FollowSymLinks
144145
RewriteEngine on
145146

146147
############################################
147-
## You can put here your magento root folder
148+
## you can put here your magento root folder
148149
## path relative to web root
149150

150151
#RewriteBase /magento/
151152

152153
############################################
153-
## Workaround for HTTP authorization
154+
## workaround for HTTP authorization
154155
## in CGI environment
155156

156157
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
@@ -162,21 +163,21 @@
162163
RewriteRule .* - [L,R=405]
163164

164165
############################################
165-
## Redirect for mobile user agents
166+
## redirect for mobile user agents
166167

167168
#RewriteCond %{REQUEST_URI} !^/mobiledirectoryhere/.*$
168169
#RewriteCond %{HTTP_USER_AGENT} "android|blackberry|ipad|iphone|ipod|iemobile|opera mobile|palmos|webos|googlebot-mobile" [NC]
169170
#RewriteRule ^(.*)$ /mobiledirectoryhere/ [L,R=302]
170171

171172
############################################
172-
## Never rewrite for existing files, directories and links
173+
## never rewrite for existing files, directories and links
173174

174175
RewriteCond %{REQUEST_FILENAME} !-f
175176
RewriteCond %{REQUEST_FILENAME} !-d
176177
RewriteCond %{REQUEST_FILENAME} !-l
177178

178179
############################################
179-
## Rewrite everything else to index.php
180+
## rewrite everything else to index.php
180181

181182
RewriteRule .* index.php [L]
182183

@@ -205,7 +206,7 @@
205206

206207
###########################################
207208
## Deny access to root files to hide sensitive application information
208-
RedirectMatch 404 /\.git
209+
RedirectMatch 403 /\.git
209210

210211
<Files composer.json>
211212
order allow,deny
@@ -280,6 +281,10 @@
280281
deny from all
281282
</Files>
282283

284+
# For 404s and 403s that aren't handled by the application, show plain 404 response
285+
ErrorDocument 404 /pub/errors/404.php
286+
ErrorDocument 403 /pub/errors/404.php
287+
283288
################################
284289
## If running in cluster environment, uncomment this
285290
## http://developer.yahoo.com/performance/rules.html#etags

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ php:
1414
env:
1515
global:
1616
- COMPOSER_BIN_DIR=~/bin
17-
- INTEGRATION_SETS=2
17+
- INTEGRATION_SETS=3
1818
matrix:
1919
- TEST_SUITE=unit
2020
- TEST_SUITE=integration INTEGRATION_INDEX=1
2121
- TEST_SUITE=integration INTEGRATION_INDEX=2
22+
- TEST_SUITE=integration INTEGRATION_INDEX=3
2223
- TEST_SUITE=static
2324
cache:
2425
apt: true

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Use the following table to verify you have the correct prerequisites to install
3333
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
3434
</tr>
3535
<tr>
36-
<td>PHP ~5.5.22 or 5.6.x</td>
36+
<td>PHP 5.6.x, 7.0.2 or 7.0.6</td>
3737
<td><code>php -v</code></td>
3838
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
3939
</tr>

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
#ini_set('display_errors', 1);
1212

1313
/* PHP version validation */
14-
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50522) {
14+
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID >= 70006)) {
1515
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports PHP 5.5.22 or later. ' .
16+
echo 'Magento supports PHP 5.6, 7.0.2, and 7.0.6 or later. ' .
1717
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<p>Magento supports PHP 5.5.22 or later. Please read
21+
<p>Magento supports PHP 5.6, 7.0.2, and 7.0.6 or later. Please read
2222
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2323
Magento System Requirements</a>.
2424
</div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.5.22|~5.6.0|~7.0.0",
5+
"php": "~5.6.0|7.0.2|~7.0.6",
66
"magento/module-store": "100.1.*",
77
"magento/module-backend": "100.1.*",
88
"magento/module-media-storage": "100.1.*",
99
"magento/framework": "100.1.*",
1010
"lib-libxml": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.1.0-rc1",
13+
"version": "100.1.0-rc3",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.5.22|~5.6.0|~7.0.0",
5+
"php": "~5.6.0|7.0.2|~7.0.6",
66
"magento/module-catalog": "101.0.*",
77
"magento/module-catalog-inventory": "100.1.*",
88
"magento/module-eav": "100.1.*",
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0-rc1",
16+
"version": "100.1.0-rc3",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~5.5.22|~5.6.0|~7.0.0",
5+
"php": "~5.6.0|7.0.2|~7.0.6",
66
"magento/module-backend": "100.1.*",
77
"magento/framework": "100.1.*"
88
},
99
"type": "magento2-module",
10-
"version": "100.1.0-rc1",
10+
"version": "100.1.0-rc3",
1111
"license": [
1212
"OSL-3.0",
1313
"AFL-3.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorizenet",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.5.22|~5.6.0|~7.0.0",
5+
"php": "~5.6.0|7.0.2|~7.0.6",
66
"magento/module-sales": "100.1.*",
77
"magento/module-store": "100.1.*",
88
"magento/module-quote": "100.1.*",
@@ -13,7 +13,7 @@
1313
"magento/framework": "100.1.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.1.0-rc1",
16+
"version": "100.1.0-rc3",
1717
"license": [
1818
"proprietary"
1919
],

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,9 @@ public function getQuote()
155155
if ($this->getStoreId()) {
156156
if (!$this->getQuoteId()) {
157157
$this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
158+
$this->_quote->setIsActive(false);
158159
$this->_quote->setStoreId($this->getStoreId());
159-
160+
160161
$this->quoteRepository->save($this->_quote);
161162
$this->setQuoteId($this->_quote->getId());
162163
$this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);

‎app/code/Magento/Backend/Model/Setup/MenuBuilder.php

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Backend\Model\Setup;
7+
8+
use Magento\Backend\Model\Menu;
9+
use Magento\Backend\Model\Menu\Builder;
10+
use Magento\Framework\App\DocRootLocator;
11+
12+
/**
13+
* Plugin class to remove web setup wizard from menu if application root is pub/ and no setup url variable is specified.
14+
*/
15+
class MenuBuilder
16+
{
17+
/**
18+
* @var DocRootLocator
19+
*/
20+
protected $docRootLocator;
21+
22+
/**
23+
* MenuBuilder constructor.
24+
*
25+
* @param DocRootLocator $docRootLocator
26+
*/
27+
public function __construct(DocRootLocator $docRootLocator)
28+
{
29+
$this->docRootLocator = $docRootLocator;
30+
}
31+
32+
/**
33+
* Removes 'Web Setup Wizard' from the menu if doc root is pub and no setup url variable is specified.
34+
*
35+
* @param Builder $subject
36+
* @param Menu $menu
37+
* @return Menu
38+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
39+
*/
40+
public function afterGetResult(Builder $subject, Menu $menu)
41+
{
42+
if ($this->docRootLocator->isPub()) {
43+
$menu->remove('Magento_Backend::setup_wizard');
44+
}
45+
return $menu;
46+
}
47+
}

0 commit comments

Comments
 (0)