Skip to content

Commit 5c136a8

Browse files
navarrnavarr
authored
Merge branch 'develop' into patch-5
2 parents f82e365 + 2552aa2 commit 5c136a8

25,829 files changed

Lines changed: 310095 additions & 82592 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,25 @@ atlassian*
2323
/lib/internal/flex/varien/.settings
2424
/node_modules
2525
/.grunt
26+
/Gruntfile.js
27+
/package.json
28+
/.php_cs
29+
/.php_cs.cache
30+
/grunt-config.json
31+
/dev/tools/grunt/configs/local-themes.js
2632

2733
/pub/media/*.*
2834
!/pub/media/.htaccess
35+
/pub/media/attribute/*
36+
!/pub/media/attribute/.htaccess
37+
/pub/media/analytics/*
2938
/pub/media/catalog/*
3039
!/pub/media/catalog/.htaccess
3140
/pub/media/customer/*
3241
!/pub/media/customer/.htaccess
3342
/pub/media/downloadable/*
3443
!/pub/media/downloadable/.htaccess
44+
/pub/media/favicon/*
3545
/pub/media/import/*
3646
!/pub/media/import/.htaccess
3747
/pub/media/theme/*
@@ -49,3 +59,5 @@ atlassian*
4959
!/var/.htaccess
5060
/vendor/*
5161
!/vendor/.htaccess
62+
/generated/*
63+
!/generated/.htaccess

‎.htaccess‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
DirectoryIndex index.php
3434

35+
<IfModule mod_php5.c>
3536
############################################
3637
## adjust memory limit
3738

@@ -53,7 +54,30 @@
5354
## disable user agent verification to not break multiple image upload
5455

5556
php_flag suhosin.session.cryptua off
57+
</IfModule>
58+
<IfModule mod_php7.c>
59+
############################################
60+
## adjust memory limit
61+
62+
php_value memory_limit 768M
63+
php_value max_execution_time 18000
64+
65+
############################################
66+
## disable automatic session start
67+
## before autoload was initialized
68+
69+
php_flag session.auto_start off
70+
71+
############################################
72+
## enable resulting html compression
73+
74+
#php_flag zlib.output_compression on
5675

76+
###########################################
77+
## disable user agent verification to not break multiple image upload
78+
79+
php_flag suhosin.session.cryptua off
80+
</IfModule>
5781
<IfModule mod_security.c>
5882
###########################################
5983
## disable POST processing to not break multiple image upload
@@ -198,7 +222,7 @@
198222
order allow,deny
199223
deny from all
200224
</Files>
201-
<Files .php_cs>
225+
<Files .php_cs.dist>
202226
order allow,deny
203227
deny from all
204228
</Files>

‎.htaccess.sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
order allow,deny
199199
deny from all
200200
</Files>
201-
<Files .php_cs>
201+
<Files .php_cs.dist>
202202
order allow,deny
203203
deny from all
204204
</Files>

‎.php_cs‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎.php_cs.dist‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/**
8+
* Pre-commit hook installation:
9+
* vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
10+
*/
11+
$finder = PhpCsFixer\Finder::create()
12+
->name('*.phtml')
13+
->exclude('dev/tests/functional/generated')
14+
->exclude('dev/tests/functional/var')
15+
->exclude('dev/tests/functional/vendor')
16+
->exclude('dev/tests/integration/tmp')
17+
->exclude('dev/tests/integration/var')
18+
->exclude('lib/internal/Cm')
19+
->exclude('lib/internal/Credis')
20+
->exclude('lib/internal/Less')
21+
->exclude('lib/internal/LinLibertineFont')
22+
->exclude('pub/media')
23+
->exclude('pub/static')
24+
->exclude('setup/vendor')
25+
->exclude('var');
26+
27+
return PhpCsFixer\Config::create()
28+
->setFinder($finder)
29+
->setRules([
30+
'@PSR2' => true,
31+
'array_syntax' => ['syntax' => 'short'],
32+
'concat_space' => ['spacing' => 'one'],
33+
'include' => true,
34+
'new_with_braces' => true,
35+
'no_empty_statement' => true,
36+
'no_extra_consecutive_blank_lines' => true,
37+
'no_leading_import_slash' => true,
38+
'no_leading_namespace_whitespace' => true,
39+
'no_multiline_whitespace_around_double_arrow' => true,
40+
'no_multiline_whitespace_before_semicolons' => true,
41+
'no_singleline_whitespace_before_semicolons' => true,
42+
'no_trailing_comma_in_singleline_array' => true,
43+
'no_unused_imports' => true,
44+
'no_whitespace_in_blank_line' => true,
45+
'object_operator_without_whitespace' => true,
46+
'ordered_imports' => true,
47+
'standardize_not_equals' => true,
48+
'ternary_operator_spaces' => true,
49+
]);

‎.travis.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,37 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.6
12+
- 5.6.29
1313
- 7.0
1414
env:
1515
global:
1616
- COMPOSER_BIN_DIR=~/bin
1717
- INTEGRATION_SETS=3
18+
- NODE_JS_VERSION=6
1819
matrix:
1920
- TEST_SUITE=unit
2021
- TEST_SUITE=integration INTEGRATION_INDEX=1
2122
- TEST_SUITE=integration INTEGRATION_INDEX=2
2223
- TEST_SUITE=integration INTEGRATION_INDEX=3
2324
- TEST_SUITE=static
25+
- TEST_SUITE=js
2426
cache:
2527
apt: true
26-
directories: $HOME/.composer/cache
28+
directories:
29+
- $HOME/.composer/cache
30+
- $HOME/.nvm
31+
- $HOME/node_modules
32+
- $HOME/yarn.lock
2733
matrix:
2834
exclude:
29-
- php: 7.0
35+
- php: 5.6.29
3036
env: TEST_SUITE=static
37+
- php: 5.6.29
38+
env: TEST_SUITE=js
3139
before_install: ./dev/travis/before_install.sh
3240
install: composer install --no-interaction --prefer-dist
3341
before_script: ./dev/travis/before_script.sh
34-
script:
35-
- cd dev/tests/$TEST_SUITE
42+
script:
3643
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
37-
- phpunit $TEST_FILTER
44+
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
45+
- if [ $TEST_SUITE == "js" ]; then grunt spec; fi

‎.user.ini‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
memory_limit = 768M
2+
max_execution_time = 18000
3+
session.auto_start = off
4+
suhosin.session.cryptua = off

‎COPYING.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Copyright © 2013-2017 Magento, Inc.
2+
13
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
24

35
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)

‎Gruntfile.js.sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2016 Magento. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--- Provide a general summary of the Pull Request in the Title above -->
2+
3+
### Description
4+
<!--- Provide a description of the changes proposed in the pull request -->
5+
6+
### Fixed Issues (if relevant)
7+
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
8+
1. magento/magento2#<issue_number>: Issue title
9+
2. ...
10+
11+
### Manual testing scenarios
12+
<!--- Provide a set of unambiguous steps to test the proposed code change -->
13+
1. ...
14+
2. ...
15+
16+
### Contribution checklist
17+
- [ ] Pull request has a meaningful description of its purpose
18+
- [ ] All commits are accompanied by meaningful commit messages
19+
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
20+
- [ ] All automated tests passed successfully (all builds on Travis CI are green)

0 commit comments

Comments
 (0)