Skip to content

Commit be2d904

Browse files
author
Jimmy
committed
Add version 2.1.15
1 parent 3982316 commit be2d904

File tree

37,490 files changed

+626051
-1554309
lines changed

Some content is hidden

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

37,490 files changed

+626051
-1554309
lines changed

‎.htaccess‎

Lines changed: 43 additions & 330 deletions
Large diffs are not rendered by default.

‎.htaccess.sample‎

Lines changed: 67 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
############################################
3131
## default index file
3232

33-
DirectoryIndex index.php
33+
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 756M
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
5670

71+
############################################
72+
## enable resulting html compression
73+
74+
#php_flag zlib.output_compression on
75+
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
@@ -111,8 +135,7 @@
111135
############################################
112136
## enable rewrites
113137

114-
# The following line has better security but add some performance overhead - see https://httpd.apache.org/docs/2.4/en/misc/perf-tuning.html
115-
Options -FollowSymLinks +SymLinksIfOwnerMatch
138+
Options +FollowSymLinks
116139
RewriteEngine on
117140

118141
############################################
@@ -180,166 +203,80 @@
180203
RedirectMatch 403 /\.git
181204

182205
<Files composer.json>
183-
<IfVersion < 2.4>
184-
order allow,deny
185-
deny from all
186-
</IfVersion>
187-
<IfVersion >= 2.4>
188-
Require all denied
189-
</IfVersion>
206+
order allow,deny
207+
deny from all
190208
</Files>
191209
<Files composer.lock>
192-
<IfVersion < 2.4>
193-
order allow,deny
194-
deny from all
195-
</IfVersion>
196-
<IfVersion >= 2.4>
197-
Require all denied
198-
</IfVersion>
210+
order allow,deny
211+
deny from all
199212
</Files>
200213
<Files .gitignore>
201-
<IfVersion < 2.4>
202-
order allow,deny
203-
deny from all
204-
</IfVersion>
205-
<IfVersion >= 2.4>
206-
Require all denied
207-
</IfVersion>
214+
order allow,deny
215+
deny from all
208216
</Files>
209217
<Files .htaccess>
210-
<IfVersion < 2.4>
211-
order allow,deny
212-
deny from all
213-
</IfVersion>
214-
<IfVersion >= 2.4>
215-
Require all denied
216-
</IfVersion>
218+
order allow,deny
219+
deny from all
217220
</Files>
218221
<Files .htaccess.sample>
219-
<IfVersion < 2.4>
220-
order allow,deny
221-
deny from all
222-
</IfVersion>
223-
<IfVersion >= 2.4>
224-
Require all denied
225-
</IfVersion>
222+
order allow,deny
223+
deny from all
226224
</Files>
227-
<Files .php_cs.dist>
228-
<IfVersion < 2.4>
229-
order allow,deny
230-
deny from all
231-
</IfVersion>
232-
<IfVersion >= 2.4>
233-
Require all denied
234-
</IfVersion>
225+
<Files .php_cs>
226+
order allow,deny
227+
deny from all
235228
</Files>
236229
<Files .travis.yml>
237-
<IfVersion < 2.4>
238-
order allow,deny
239-
deny from all
240-
</IfVersion>
241-
<IfVersion >= 2.4>
242-
Require all denied
243-
</IfVersion>
230+
order allow,deny
231+
deny from all
244232
</Files>
245233
<Files CHANGELOG.md>
246-
<IfVersion < 2.4>
247-
order allow,deny
248-
deny from all
249-
</IfVersion>
250-
<IfVersion >= 2.4>
251-
Require all denied
252-
</IfVersion>
234+
order allow,deny
235+
deny from all
236+
</Files>
237+
<Files CONTRIBUTING.md>
238+
order allow,deny
239+
deny from all
253240
</Files>
254241
<Files COPYING.txt>
255-
<IfVersion < 2.4>
256-
order allow,deny
257-
deny from all
258-
</IfVersion>
259-
<IfVersion >= 2.4>
260-
Require all denied
261-
</IfVersion>
242+
order allow,deny
243+
deny from all
262244
</Files>
263245
<Files Gruntfile.js>
264-
<IfVersion < 2.4>
265-
order allow,deny
266-
deny from all
267-
</IfVersion>
268-
<IfVersion >= 2.4>
269-
Require all denied
270-
</IfVersion>
246+
order allow,deny
247+
deny from all
271248
</Files>
272249
<Files LICENSE.txt>
273-
<IfVersion < 2.4>
274-
order allow,deny
275-
deny from all
276-
</IfVersion>
277-
<IfVersion >= 2.4>
278-
Require all denied
279-
</IfVersion>
250+
order allow,deny
251+
deny from all
280252
</Files>
281253
<Files LICENSE_AFL.txt>
282-
<IfVersion < 2.4>
283-
order allow,deny
284-
deny from all
285-
</IfVersion>
286-
<IfVersion >= 2.4>
287-
Require all denied
288-
</IfVersion>
254+
order allow,deny
255+
deny from all
289256
</Files>
290257
<Files nginx.conf.sample>
291-
<IfVersion < 2.4>
292-
order allow,deny
293-
deny from all
294-
</IfVersion>
295-
<IfVersion >= 2.4>
296-
Require all denied
297-
</IfVersion>
258+
order allow,deny
259+
deny from all
298260
</Files>
299261
<Files package.json>
300-
<IfVersion < 2.4>
301-
order allow,deny
302-
deny from all
303-
</IfVersion>
304-
<IfVersion >= 2.4>
305-
Require all denied
306-
</IfVersion>
262+
order allow,deny
263+
deny from all
307264
</Files>
308265
<Files php.ini.sample>
309-
<IfVersion < 2.4>
310-
order allow,deny
311-
deny from all
312-
</IfVersion>
313-
<IfVersion >= 2.4>
314-
Require all denied
315-
</IfVersion>
266+
order allow,deny
267+
deny from all
316268
</Files>
317269
<Files README.md>
318-
<IfVersion < 2.4>
319-
order allow,deny
320-
deny from all
321-
</IfVersion>
322-
<IfVersion >= 2.4>
323-
Require all denied
324-
</IfVersion>
270+
order allow,deny
271+
deny from all
325272
</Files>
326273
<Files auth.json>
327-
<IfVersion < 2.4>
328-
order allow,deny
329-
deny from all
330-
</IfVersion>
331-
<IfVersion >= 2.4>
332-
Require all denied
333-
</IfVersion>
274+
order allow,deny
275+
deny from all
334276
</Files>
335277
<Files magento_umask>
336-
<IfVersion < 2.4>
337-
order allow,deny
338-
deny from all
339-
</IfVersion>
340-
<IfVersion >= 2.4>
341-
Require all denied
342-
</IfVersion>
278+
order allow,deny
279+
deny from all
343280
</Files>
344281

345282
# For 404s and 403s that aren't handled by the application, show plain 404 response

‎.php_cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎.travis.yml‎

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,37 @@
11
sudo: required
22
dist: trusty
3-
group: edge
43
addons:
54
apt:
65
packages:
76
- mysql-server-5.6
87
- mysql-client-core-5.6
98
- mysql-client-5.6
109
- postfix
11-
firefox: "46.0"
12-
hosts:
13-
- magento2.travis
1410
language: php
1511
php:
12+
- 5.6
1613
- 7.0
17-
- 7.1
1814
env:
1915
global:
2016
- COMPOSER_BIN_DIR=~/bin
2117
- INTEGRATION_SETS=3
22-
- NODE_JS_VERSION=6
23-
- MAGENTO_HOST_NAME="magento2.travis"
2418
matrix:
2519
- TEST_SUITE=unit
26-
- TEST_SUITE=static
27-
- TEST_SUITE=js GRUNT_COMMAND=spec
28-
- TEST_SUITE=js GRUNT_COMMAND=static
2920
- TEST_SUITE=integration INTEGRATION_INDEX=1
3021
- TEST_SUITE=integration INTEGRATION_INDEX=2
3122
- TEST_SUITE=integration INTEGRATION_INDEX=3
32-
- TEST_SUITE=functional
23+
- TEST_SUITE=static
24+
cache:
25+
apt: true
26+
directories: $HOME/.composer/cache
3327
matrix:
3428
exclude:
3529
- php: 7.0
3630
env: TEST_SUITE=static
37-
- php: 7.0
38-
env: TEST_SUITE=js GRUNT_COMMAND=spec
39-
- php: 7.0
40-
env: TEST_SUITE=js GRUNT_COMMAND=static
41-
- php: 7.0
42-
env: TEST_SUITE=functional
43-
cache:
44-
apt: true
45-
directories:
46-
- $HOME/.composer/cache
47-
- $HOME/.nvm
48-
- $HOME/node_modules
49-
- $HOME/yarn.lock
5031
before_install: ./dev/travis/before_install.sh
5132
install: composer install --no-interaction --prefer-dist
5233
before_script: ./dev/travis/before_script.sh
53-
script:
54-
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
55-
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
56-
57-
# The scripts for grunt/phpunit type tests
58-
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
59-
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
60-
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
34+
script:
35+
- cd dev/tests/$TEST_SUITE
36+
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
37+
- phpunit $TEST_FILTER

0 commit comments

Comments
 (0)