Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/code/Magento/Weee/Model/Tax.php

.gitignore

@@ -1,36 +1,37 @@
 /.buildpath
 /.cache
-/.htaccess
 /.metadata
 /.project
 /.settings
 atlassian*
-/index.php
 /nbproject
 /sitemap
-/.htaccess.orig
 /.idea
 /.gitattributes
 /app/config_sandbox
 /app/etc/local.xml
-/app/etc/local.xml.*
 /app/etc/*/module.xml
-/downloader/.cache
-/downloader/cache.cfg
-/downloader/connect.cfg
-/lib/flex/uploader/.actionScriptProperties
-/lib/flex/uploader/.flexProperties
-/lib/flex/uploader/.project
-/lib/flex/uploader/.settings
-/lib/flex/varien/.actionScriptProperties
-/lib/flex/varien/.flexLibProperties
-/lib/flex/varien/.project
-/lib/flex/varien/.settings
-/pub/cache/*
-/pub/media/*
+/lib/internal/flex/uploader/.actionScriptProperties
+/lib/internal/flex/uploader/.flexProperties
+/lib/internal/flex/uploader/.project
+/lib/internal/flex/uploader/.settings
+/lib/internal/flex/varien/.actionScriptProperties
+/lib/internal/flex/varien/.flexLibProperties
+/lib/internal/flex/varien/.project
+/lib/internal/flex/varien/.settings
+
+/pub/media/*.*
+!/pub/media/.htaccess
 /pub/media/customer/*
+!/pub/media/customer/.htaccess
 /pub/media/downloadable/*
+!/pub/media/downloadable/.htaccess
+/pub/media/theme/*
+/pub/media/theme_customization/*
+!/pub/media/theme_customization/.htaccess
 /pub/static/*
 !/pub/static/.htaccess
+
 /var/*
-/app/code/Magento/TestModule*
+!/var/.htaccess
+/vendor

.htaccess

@@ -32,7 +32,7 @@
 ## adjust memory limit
 
 #    php_value memory_limit 64M
-    php_value memory_limit 2048M
+    php_value memory_limit 768M
     php_value max_execution_time 18000
 
 ############################################
@@ -47,20 +47,27 @@
     #php_flag zlib.output_compression on
 
 ###########################################
-# disable user agent verification to not break multiple image upload
+## disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
 
 </IfModule>
 
 <IfModule mod_security.c>
 ###########################################
-# disable POST processing to not break multiple image upload
+## disable POST processing to not break multiple image upload
 
     SecFilterEngine Off
     SecFilterScanPOST Off
 </IfModule>
 
+<IfModule mod_headers.c>
+############################################
+## prevent clickjacking
+
+    Header set X-Frame-Options SAMEORIGIN
+</IfModule>
+
 <IfModule mod_deflate.c>
 
 ############################################
@@ -173,11 +180,12 @@
 ## Deny access to release notes to prevent disclosure of the installed Magento version
 
     <Files RELEASE_NOTES.txt>
-        order allow,deny
-        deny from all
+        Order allow,deny
+        Deny from all
     </Files>
 ############################################
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
+

.htaccess.sample

@@ -31,8 +31,7 @@
 ############################################
 ## adjust memory limit
 
-#    php_value memory_limit 64M
-    php_value memory_limit 128M
+    php_value memory_limit 256M
     php_value max_execution_time 18000
 
 ############################################
@@ -47,20 +46,27 @@
     #php_flag zlib.output_compression on
 
 ###########################################
-# disable user agent verification to not break multiple image upload
+## disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
 
 </IfModule>
 
 <IfModule mod_security.c>
 ###########################################
-# disable POST processing to not break multiple image upload
+## disable POST processing to not break multiple image upload
 
     SecFilterEngine Off
     SecFilterScanPOST Off
 </IfModule>
 
+<IfModule mod_headers.c>
+############################################
+## prevent clickjacking
+
+    Header set X-Frame-Options SAMEORIGIN
+</IfModule>
+
 <IfModule mod_deflate.c>
 
 ############################################
@@ -118,6 +124,12 @@
 
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 
+############################################
+## TRACE and TRACK HTTP methods disabled to prevent XSS attacks
+
+    RewriteCond %{REQUEST_METHOD} ^TRAC[EK]
+    RewriteRule .* - [L,R=405]
+
 ############################################
 ## always send 404 on missing files in these folders
 
@@ -161,6 +173,14 @@
     Order allow,deny
     Allow from all
 
+###########################################
+## Deny access to release notes to prevent disclosure of the installed Magento version
+
+    <Files RELEASE_NOTES.txt>
+        Order allow,deny
+        Deny from all
+    </Files>
+
 ############################################
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags

.travis.yml

@@ -0,0 +1,49 @@
+language: php
+php:
+  - 5.4
+  - 5.5
+env:
+  - TEST_SUITE=unit
+  - TEST_SUITE=integration
+  - TEST_SUITE=integration_integrity
+  - TEST_SUITE=static_phpcs
+  - TEST_SUITE=static_annotation
+matrix:
+  exclude:
+    - php: 5.5
+      env: TEST_SUITE=static_phpcs
+    - php: 5.5
+      env: TEST_SUITE=static_annotation
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq postfix
+before_script:
+  # mock mail
+  - sudo service postfix stop
+  - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
+  - echo -e '#!/usr/bin/env bash\nexit 0' | sudo tee /usr/sbin/sendmail
+  - echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' | sudo tee "/home/travis/.phpenv/versions/`php -i | grep "PHP Version" | head -n 1 | grep -o -P '\d+\.\d+\.\d+.*'`/etc/conf.d/sendmail.ini"
+  # Disable xDebug
+  - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+  # Create DB for Integration tests
+  - sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then mysql -e 'create database magento_integration_tests;'; mv dev/tests/integration/etc/local-mysql.travis.xml.dist dev/tests/integration/etc/local-mysql.xml; fi"
+  # Install tools for static tests
+  - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ] || [ '$TEST_SUITE' = 'static_annotation' ]; then pear install pear/PHP_CodeSniffer-1.5.2; fi"
+  # Change memmory_limit for travis server
+  - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - phpenv rehash;
+  - composer install --no-interaction --prefer-source --dev
+  - cd setup
+  - composer install --no-interaction --prefer-source --dev
+  - cd ..
+script:
+  # Unit tests
+  - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
+  # Integration tests
+  - sh -c "if [ '$TEST_SUITE' = 'integration' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist; fi"
+  # Integration integrity tests
+  - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
+  # Static tests [Code Style]
+  - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
+  # Static tests [Code Style]
+  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"